diff --git a/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
index f586045c..aea2ef78 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
@@ -61,7 +61,7 @@ public sealed class EqdpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFil
     }
 
     protected override IEnumerable<(EqdpIdentifier, EqdpEntryInternal)> Enumerate()
-        => Editor.Eqdp.OrderBy(kvp => kvp.Key.SetId)
+        => Editor.Eqdp.OrderBy(kvp => kvp.Key.SetId.Id)
             .ThenBy(kvp => kvp.Key.GenderRace)
             .ThenBy(kvp => kvp.Key.Slot)
             .Select(kvp => (kvp.Key, kvp.Value));
diff --git a/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
index b1031b44..733517f3 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
@@ -60,7 +60,7 @@ public sealed class EqpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
 
     protected override IEnumerable<(EqpIdentifier, EqpEntryInternal)> Enumerate()
         => Editor.Eqp
-            .OrderBy(kvp => kvp.Key.SetId)
+            .OrderBy(kvp => kvp.Key.SetId.Id)
             .ThenBy(kvp => kvp.Key.Slot)
             .Select(kvp => (kvp.Key, kvp.Value));
 
diff --git a/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
index 628cee40..a33f8b7b 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
@@ -59,7 +59,7 @@ public sealed class EstMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
 
     protected override IEnumerable<(EstIdentifier, EstEntry)> Enumerate()
         => Editor.Est
-            .OrderBy(kvp => kvp.Key.SetId)
+            .OrderBy(kvp => kvp.Key.SetId.Id)
             .ThenBy(kvp => kvp.Key.GenderRace)
             .ThenBy(kvp => kvp.Key.Slot)
             .Select(kvp => (kvp.Key, kvp.Value));
diff --git a/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
index bc2e1bde..5d67ddcf 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
@@ -49,7 +49,7 @@ public sealed class GlobalEqpMetaDrawer(ModMetaEditor editor, MetaFileManager me
     protected override IEnumerable<(GlobalEqpManipulation, byte)> Enumerate()
         => Editor.GlobalEqp
             .OrderBy(identifier => identifier.Type)
-            .ThenBy(identifier => identifier.Condition)
+            .ThenBy(identifier => identifier.Condition.Id)
             .Select(identifier => (identifier, (byte)0));
 
     private static void DrawIdentifierInput(ref GlobalEqpManipulation identifier)
diff --git a/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
index 1e91731d..bd42b60a 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
@@ -58,7 +58,7 @@ public sealed class GmpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
 
     protected override IEnumerable<(GmpIdentifier, GmpEntry)> Enumerate()
         => Editor.Gmp
-            .OrderBy(kvp => kvp.Key.SetId)
+            .OrderBy(kvp => kvp.Key.SetId.Id)
             .Select(kvp => (kvp.Key, kvp.Value));
 
     private static bool DrawIdentifierInput(ref GmpIdentifier identifier)
diff --git a/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs b/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
index e33eb1aa..4e949b98 100644
--- a/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
@@ -142,11 +142,11 @@ public sealed class ImcMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
     protected override IEnumerable<(ImcIdentifier, ImcEntry)> Enumerate()
         => Editor.Imc
             .OrderBy(kvp => kvp.Key.ObjectType)
-            .ThenBy(kvp => kvp.Key.PrimaryId)
+            .ThenBy(kvp => kvp.Key.PrimaryId.Id)
             .ThenBy(kvp => kvp.Key.EquipSlot)
             .ThenBy(kvp => kvp.Key.BodySlot)
-            .ThenBy(kvp => kvp.Key.SecondaryId)
-            .ThenBy(kvp => kvp.Key.Variant)
+            .ThenBy(kvp => kvp.Key.SecondaryId.Id)
+            .ThenBy(kvp => kvp.Key.Variant.Id)
             .Select(kvp => (kvp.Key, kvp.Value));
 
     public static bool DrawObjectType(ref ImcIdentifier identifier, float width = 110)