diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
index a1d527751..359b09ca1 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Contracts/IHaveSurrogateKey.cs
@@ -2,6 +2,6 @@
 {
     internal interface IHaveSurrogateKey
     {
-        ushort Id { get; }
+        int Id { get; }
     }
 }
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index d7616f1d0..f5f31da7d 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class FilterList : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public License? License { get; private set; }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index 266f0cacc..a2a2fb0bf 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class License : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public string? GitHubKey { get; private set; }
         public Uri? Url { get; private set; }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index 60b8245a5..95a6b9ff6 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Maintainer : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public Uri? Url { get; private set; }
         public string? EmailAddress { get; private set; }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index 8e8dc10c6..4cb6d0c33 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Software : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public Uri? HomeUrl { get; private set; }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index 007747f8a..5b0e7b2ef 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -6,7 +6,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Syntax : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public Uri? Url { get; private set; }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
index 64fa5f2b5..02f4c1662 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class Tag : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public string Name { get; private set; } = null!;
         public string? Description { get; private set; }
         public ICollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs
index 94c9c5f0d..37181daf7 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
 {
     public class ViewUrlMirror : IHaveSurrogateKey
     {
-        public ushort Id { get; private set; }
+        public int Id { get; private set; }
         public FilterList FilterList { get; private set; } = null!;
         public Uri Url { get; private set; } = null!;
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs
index aab06e541..c68a987be 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities
     public class ViewUrlPartial
     {
         public FilterList FilterList { get; private set; } = null!;
-        public ushort Position { get; private set; }
+        public int Position { get; private set; }
         public Uri Url { get; private set; } = null!;
     }
 }
\ No newline at end of file
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/DependentTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/DependentTypeConfiguration.cs
index 4cb8ace3c..fb822c7b2 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/DependentTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/DependentTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string dependencyFilterListId = nameof(Dependent.DependencyFilterList) + "Id";
             const string dependentFilterListId = nameof(Dependent.DependentFilterList) + "Id";
-            builder.Property<ushort>(dependencyFilterListId);
-            builder.Property<ushort>(dependentFilterListId);
+            builder.Property<int>(dependencyFilterListId);
+            builder.Property<int>(dependentFilterListId);
             builder.HasKey(dependencyFilterListId, dependentFilterListId);
             builder.HasOne(d => d.DependencyFilterList)
                 .WithMany(f => (IEnumerable<TEntity>)f.DependencyFilterLists)
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListLanguageTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListLanguageTypeConfiguration.cs
index 6b9613a37..ce2cd2e53 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListLanguageTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListLanguageTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string filterListId = nameof(FilterListLanguage.FilterList) + "Id";
             const string languageId = nameof(FilterListLanguage.Language) + "Id";
-            builder.Property<ushort>(filterListId);
-            builder.Property<ushort>(languageId);
+            builder.Property<int>(filterListId);
+            builder.Property<int>(languageId);
             builder.HasKey(filterListId, languageId);
         }
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListMaintainerTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListMaintainerTypeConfiguration.cs
index b6516b416..ddf6cba56 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListMaintainerTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListMaintainerTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string filterListId = nameof(FilterListMaintainer.FilterList) + "Id";
             const string maintainerId = nameof(FilterListMaintainer.Maintainer) + "Id";
-            builder.Property<ushort>(filterListId);
-            builder.Property<ushort>(maintainerId);
+            builder.Property<int>(filterListId);
+            builder.Property<int>(maintainerId);
             builder.HasKey(filterListId, maintainerId);
         }
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListSyntaxTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListSyntaxTypeConfiguration.cs
index 093f9f1ab..cd1024019 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListSyntaxTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListSyntaxTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string filterListId = nameof(FilterListSyntax.FilterList) + "Id";
             const string syntaxId = nameof(FilterListSyntax.Syntax) + "Id";
-            builder.Property<ushort>(filterListId);
-            builder.Property<ushort>(syntaxId);
+            builder.Property<int>(filterListId);
+            builder.Property<int>(syntaxId);
             builder.HasKey(filterListId, syntaxId);
         }
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListTagTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListTagTypeConfiguration.cs
index 1d1f9d192..f5f6c8e18 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListTagTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/FilterListTagTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string filterListId = nameof(FilterListTag.FilterList) + "Id";
             const string tagId = nameof(FilterListTag.Tag) + "Id";
-            builder.Property<ushort>(filterListId);
-            builder.Property<ushort>(tagId);
+            builder.Property<int>(filterListId);
+            builder.Property<int>(tagId);
             builder.HasKey(filterListId, tagId);
         }
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ForkTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ForkTypeConfiguration.cs
index 770c92189..afa343733 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ForkTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ForkTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string upstreamFilterListId = nameof(Fork.UpstreamFilterList) + "Id";
             const string forkFilterListId = nameof(Fork.ForkFilterList) + "Id";
-            builder.Property<ushort>(upstreamFilterListId);
-            builder.Property<ushort>(forkFilterListId);
+            builder.Property<int>(upstreamFilterListId);
+            builder.Property<int>(forkFilterListId);
             builder.HasKey(upstreamFilterListId, forkFilterListId);
             builder.HasOne(f => f.UpstreamFilterList)
                 .WithMany(f => (IEnumerable<TEntity>)f.UpstreamFilterLists)
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/MergeTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/MergeTypeConfiguration.cs
index 7e022fa9c..1324ea803 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/MergeTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/MergeTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string includedInFilterListId = nameof(Merge.IncludedInFilterList) + "Id";
             const string includesFilterListId = nameof(Merge.IncludesFilterList) + "Id";
-            builder.Property<ushort>(includedInFilterListId);
-            builder.Property<ushort>(includesFilterListId);
+            builder.Property<int>(includedInFilterListId);
+            builder.Property<int>(includesFilterListId);
             builder.HasKey(includedInFilterListId, includesFilterListId);
             builder.HasOne(m => m.IncludedInFilterList)
                 .WithMany(f => (IEnumerable<TEntity>)f.IncludedInFilterLists)
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/SoftwareSyntaxTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/SoftwareSyntaxTypeConfiguration.cs
index c90f6b9a3..53ed7be7e 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/SoftwareSyntaxTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/SoftwareSyntaxTypeConfiguration.cs
@@ -14,8 +14,8 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
 
             const string softwareId = nameof(SoftwareSyntax.Software) + "Id";
             const string syntaxId = nameof(SoftwareSyntax.Syntax) + "Id";
-            builder.Property<ushort>(softwareId);
-            builder.Property<ushort>(syntaxId);
+            builder.Property<int>(softwareId);
+            builder.Property<int>(syntaxId);
             builder.HasKey(softwareId, syntaxId);
         }
     }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ViewUrlPartialTypeConfiguration.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ViewUrlPartialTypeConfiguration.cs
index af03d5e39..c80d1aa9d 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ViewUrlPartialTypeConfiguration.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Mappings/ViewUrlPartialTypeConfiguration.cs
@@ -13,7 +13,7 @@ public virtual void Configure(EntityTypeBuilder<TEntity> builder)
             _ = builder ?? throw new ArgumentNullException(nameof(builder));
 
             const string filterListId = nameof(ViewUrlPartial.FilterList) + "Id";
-            builder.Property<ushort>(filterListId);
+            builder.Property<int>(filterListId);
             builder.HasKey(filterListId, nameof(ViewUrlPartial.Position));
         }
     }