diff --git a/modules/nixos/imports.nix b/modules/nixos/imports.nix
index 9cf13ed..9927dad 100644
--- a/modules/nixos/imports.nix
+++ b/modules/nixos/imports.nix
@@ -7,6 +7,10 @@ in
     base.imports = [
       user
       "${modulesPath}/profiles/minimal.nix"
+      inputs.srvos.nixosModules.common
+    ];
+    base.disabledModules = [
+      "${inputs.srvos}/nixos/common/zfs.nix"
     ];
 
     core.imports = [
diff --git a/modules/nixos/interface.nix b/modules/nixos/interface.nix
index 4f755b8..19a0738 100644
--- a/modules/nixos/interface.nix
+++ b/modules/nixos/interface.nix
@@ -1,5 +1,5 @@
 {
-  flake.modules.nixos.core =
+  flake.modules.nixos.base =
     { config, lib, ... }:
     {
       options.local.ethernetInterface = lib.mkOption {
diff --git a/modules/nixos/networking.nix b/modules/nixos/networking.nix
index e904914..9902354 100644
--- a/modules/nixos/networking.nix
+++ b/modules/nixos/networking.nix
@@ -12,12 +12,12 @@
         AuthenticationMethods = "publickey";
       };
     };
+
+    networking.nameservers = [ "94.140.14.14" ];
   };
 
   flake.modules.nixos.core = {
-    networking.nameservers = [ "94.140.14.14" ];
     services.openssh.enable = true;
-    services.openssh.startWhenNeeded = false;
   };
 
   flake.modules.nixos.desktop =
diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix
index bf37198..9f5c263 100644
--- a/modules/nixos/nix.nix
+++ b/modules/nixos/nix.nix
@@ -1,10 +1,6 @@
 { inputs, lib, ... }:
 {
   flake.modules.nixos.base = {
-    nix.settings.trusted-users = [
-      "root"
-      "@wheel"
-    ];
     nix.registry = builtins.mapAttrs (_: flake: { flake = lib.mkDefault flake; }) (
       lib.filterAttrs (name: _: name != "nixpkgs") inputs
     );
@@ -13,18 +9,18 @@
       name = "nix/inputs/${name}";
       value.source = value.outPath;
     }) inputs;
-  };
 
-  flake.modules.nixos.core = {
     nix = {
       settings = {
         auto-optimise-store = true;
         sandbox = true;
         allowed-users = [ "@wheel" ];
+        trusted-users = [
+          "root"
+          "@wheel"
+        ];
         use-xdg-base-directories = true;
         experimental-features = [ "pipe-operator" ];
-        substituters = [ "https://cache.garnix.io" ];
-        trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
       };
     };
   };