diff --git a/Gemfile b/Gemfile
index 3ed111e65..8a72fe8d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,10 +43,6 @@ group :development, :test do
   gem "state_machines"
   gem "activerecord-typedstore"
   gem "identity_cache"
-  gem "cityhash",
-    git: "https://github.com/csfrancis/cityhash.git",
-    ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36",
-    require: false
   gem "activeresource"
   gem "google-protobuf"
   gem "graphql"
diff --git a/Gemfile.lock b/Gemfile.lock
index 72ab83c14..1d94c4795 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/csfrancis/cityhash.git
-  revision: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
-  ref: 3cfc7d01f333c01811d5e834f1495eaa29f87c36
-  specs:
-    cityhash (0.6.0)
-
 PATH
   remote: .
   specs:
@@ -150,6 +143,9 @@ GEM
       activemodel
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-protobuf (4.29.3-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
     google-protobuf (4.29.3-arm64-darwin)
       bigdecimal
       rake (>= 13)
@@ -220,12 +216,18 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
+    nokogiri (1.18.2-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-aarch64-linux-musl)
+      racc (~> 1.4)
     nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-musl)
+      racc (~> 1.4)
     ostruct (0.6.0)
     parallel (1.26.3)
     parser (3.3.7.0)
@@ -328,6 +330,7 @@ GEM
     sorbet (0.5.11766)
       sorbet-static (= 0.5.11766)
     sorbet-runtime (0.5.11766)
+    sorbet-static (0.5.11766-aarch64-linux)
     sorbet-static (0.5.11766-universal-darwin)
     sorbet-static (0.5.11766-x86_64-linux)
     sorbet-static-and-runtime (0.5.11766)
@@ -341,9 +344,12 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-musl)
     sqlite3 (2.5.0-arm64-darwin)
     sqlite3 (2.5.0-x86_64-darwin)
     sqlite3 (2.5.0-x86_64-linux-gnu)
+    sqlite3 (2.5.0-x86_64-linux-musl)
     state_machines (0.6.0)
     stringio (3.1.2)
     thor (1.3.2)
@@ -371,16 +377,21 @@ GEM
     zlib (3.1.0)
 
 PLATFORMS
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
   arm64-darwin
+  universal-darwin
   x86_64-darwin
   x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   aasm
   activerecord-typedstore
   activeresource
   bcrypt
-  cityhash!
   config
   debug
   frozen_record
diff --git a/sorbet/rbi/gems/cityhash@0.6.0-3cfc7d01f333c01811d5e834f1495eaa29f87c36.rbi b/sorbet/rbi/gems/cityhash@0.6.0-3cfc7d01f333c01811d5e834f1495eaa29f87c36.rbi
deleted file mode 100644
index 9f121e060..000000000
--- a/sorbet/rbi/gems/cityhash@0.6.0-3cfc7d01f333c01811d5e834f1495eaa29f87c36.rbi
+++ /dev/null
@@ -1,36 +0,0 @@
-# typed: true
-
-# DO NOT EDIT MANUALLY
-# This is an autogenerated file for types exported from the `cityhash` gem.
-# Please instead update this file by running `bin/tapioca gem cityhash`.
-
-
-# source://cityhash//lib/cityhash/version.rb#1
-module CityHash
-  class << self
-    # source://cityhash//lib/cityhash.rb#14
-    def hash128(input, seed = T.unsafe(nil)); end
-
-    # source://cityhash//lib/cityhash.rb#8
-    def hash64(input, seed1 = T.unsafe(nil), seed2 = T.unsafe(nil)); end
-  end
-end
-
-# source://cityhash//lib/cityhash.rb#6
-CityHash::HIGH64_MASK = T.let(T.unsafe(nil), Integer)
-
-module CityHash::Internal
-  class << self
-    def hash128(_arg0); end
-    def hash128_with_seed(_arg0, _arg1); end
-    def hash64(_arg0); end
-    def hash64_with_seed(_arg0, _arg1); end
-    def hash64_with_seeds(_arg0, _arg1, _arg2); end
-  end
-end
-
-# source://cityhash//lib/cityhash.rb#5
-CityHash::LOW64_MASK = T.let(T.unsafe(nil), Integer)
-
-# source://cityhash//lib/cityhash/version.rb#2
-CityHash::VERSION = T.let(T.unsafe(nil), String)