diff --git a/common/substitutors.nix b/common/substitutors.nix
index df3cb37..855d7ee 100644
--- a/common/substitutors.nix
+++ b/common/substitutors.nix
@@ -1,17 +1,19 @@
-{ ... }: {
+{ config, lib, ... }: {
   nix = {
     settings = {
       # auto optimise every so often
       # auto-optimise-store = true;
       experimental-features = [ "nix-command" "flakes" ];
       substituters = [
+        (lib.mkIf (config.networking.hostName != "nuOS") "https://cache.itepastra.nl")
         "https://hyprland.cachix.org"
         "https://cache.iog.io"
         "https://cuda-maintainers.cachix.org"
-        "https://nix-community.cachix.org/"
+        "https://nix-community.cachix.org"
         "https://cache.iog.io"
       ];
       trusted-public-keys = [
+        "cache.itepastra.nl:zCB+g5uXlDuFXbs9pI10UmidFQt17kFTaPywv+J33FQ="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
         "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix
index bb967b7..fe0b3aa 100644
--- a/hosts/nuos/configuration.nix
+++ b/hosts/nuos/configuration.nix
@@ -45,11 +45,6 @@
     };
   };
 
-  nix.sshServe = {
-    enable = true;
-    keys = import ../../common/ssh-keys.nix;
-  };
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -135,6 +130,12 @@
   };
 
   services = {
+    nix-serve = {
+      enable = true;
+      package = pkgs.nix-serve-ng;
+      secretKeyFile = "/secrets/nix-store-key.pem";
+      port = 22332;
+    };
     github-runners = {
       flurry-runner = {
         enable = true;
@@ -233,6 +234,7 @@
           };
 
           "calendar.itepastra.nl" = proxy "itepastra.nl" "http://[::1]:29341";
+          "cache.itepastra.nl" = proxy "itepastra.nl" "http://[::1]:22332";
         };
       };
   };
@@ -250,6 +252,7 @@
       "itepastra.nl".extraDomainNames = [
         "locked.itepastra.nl"
         "calendar.itepastra.nl"
+        "cache.itepastra.nl"
       ];
     };
   };