diff --git a/ZuneShell/StrixMusic/AbstractStorage/SystemIOFileData.cs b/ZuneShell/StrixMusic/AbstractStorage/SystemIOFileData.cs
index 9652744..d6b31ab 100644
--- a/ZuneShell/StrixMusic/AbstractStorage/SystemIOFileData.cs
+++ b/ZuneShell/StrixMusic/AbstractStorage/SystemIOFileData.cs
@@ -46,7 +46,7 @@ namespace OwlCore.AbstractStorage
         public string FileExtension => File.Extension;
 
         /// <inheritdoc/>
-        public string Id => FluentStore.SDK.Helpers.StorageHelper.GetFileId(File);
+        public string Id => Extensions.StringExtensions.HashMD5Fast(Path);
 
         /// <inheritdoc/>
         public IFileDataProperties Properties { get; set; }
diff --git a/ZuneShell/StrixMusic/AbstractStorage/SystemIOFolderData.cs b/ZuneShell/StrixMusic/AbstractStorage/SystemIOFolderData.cs
index 6c6e2ad..37b292d 100644
--- a/ZuneShell/StrixMusic/AbstractStorage/SystemIOFolderData.cs
+++ b/ZuneShell/StrixMusic/AbstractStorage/SystemIOFolderData.cs
@@ -41,7 +41,7 @@ namespace OwlCore.AbstractStorage
         public string Path => Directory.FullName;
 
         /// <inheritdoc/>
-        public string Id => FluentStore.SDK.Helpers.StorageHelper.GetFileId(Directory);
+        public string Id => Extensions.StringExtensions.HashMD5Fast(Path);
 
         /// <inheritdoc/>
         public Task<IEnumerable<IFileData>> GetFilesAsync()