diff --git a/flake.nix b/flake.nix
index 3f362e2..494ce4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,11 +114,13 @@
     extra-substituters = [
       "https://nix-community.cachix.org"
       "https://cache.garnix.io"
+      "https://cything.cachix.org"
       "https://cache.cy7.sh/main"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI="
       "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
     ];
     builders-use-substitutes = true;
diff --git a/hosts/common.nix b/hosts/common.nix
index bfa70e3..0fb2fc6 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -10,13 +10,17 @@
         "@wheel"
       ];
       trusted-public-keys = [
+        "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI="
         "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
       ];
       substituters = [
+        "https://niri.cachix.org"
         "https://nix-community.cachix.org"
         "https://cache.garnix.io"
+        "https://cything.cachix.org"
         "https://cache.cy7.sh/main"
       ];
     };
diff --git a/overlay/attic/default.nix b/overlay/attic/default.nix
deleted file mode 100644
index 14f5daf..0000000
--- a/overlay/attic/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-final: prev: {
-  attic-server = prev.attic-server.overrideAttrs {
-    patches = [
-      ./prefetch-32-chunks.patch
-    ];
-  };
-}
diff --git a/overlay/attic/prefetch-32-chunks.patch b/overlay/attic/prefetch-32-chunks.patch
deleted file mode 100644
index bbb801b..0000000
--- a/overlay/attic/prefetch-32-chunks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/server/src/api/binary_cache.rs b/server/src/api/binary_cache.rs
-index 02e4857..71eeee8 100644
---- a/server/src/api/binary_cache.rs
-+++ b/server/src/api/binary_cache.rs
-@@ -262,7 +262,7 @@ async fn get_nar(
- 
-         // TODO: Make num_prefetch configurable
-         // The ideal size depends on the average chunk size
--        let merged = merge_chunks(chunks, streamer, storage, 2).map_err(|e| {
-+        let merged = merge_chunks(chunks, streamer, storage, 32).map_err(|e| {
-             tracing::error!(%e, "Stream error");
-             e
-         });
diff --git a/overlay/default.nix b/overlay/default.nix
index 0eea626..3a655fd 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -3,7 +3,6 @@ let
   overlays = [
     ./zipline
     ./bitwarden
-    ./attic
   ];
   importedOverlays = map (m: import m) overlays;
 in