diff --git a/flake.nix b/flake.nix
index 110df3bf..30b1ef7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,9 +17,6 @@
             pkgs.alejandra
             pkgs.git
             pkgs.nodePackages.prettier
-            pkgs.ssh-to-age
-            pkgs.sops
-            pkgs.age
           ];
         };
         formatter = pkgs.alejandra;
diff --git a/nixos/default.nix b/nixos/default.nix
index 68e2e300..855e623f 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -21,16 +21,22 @@ let
     shared
     ++ [
       ./system/var/nh/adampad.nix
+      ./srv/xserver/adampad.nix
+      ./hardware/adampad.nix
     ];
   cnix =
     shared
     ++ [
       ./system/var/nh/cnix.nix
+      ./srv/xserver/cnix.nix
+      ./hardware/cnix.nix
     ];
   toothpc =
     shared
     ++ [
-      ./system/var/nh/toothpc-nh.nix
+      ./system/var/nh/toothpc.nix
+      ./srv/xserver/toothpc.nix
+      ./hardware/toothpc.nix
     ];
 in {
   inherit shared adampad cnix toothpc;
diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix
index 2e329670..f089fc9f 100644
--- a/nixos/hosts/default.nix
+++ b/nixos/hosts/default.nix
@@ -24,10 +24,7 @@
           "${mod}/system/boot/lanzaboote.nix"
           "${mod}/system/var/network/cnix.nix"
 
-          "${mod}/hardware/cnix.nix"
-
           "${mod}/srv/blueman"
-          "${mod}/srv/xserver/cnix.nix"
 
           "${mod}/opt/gaming.nix"
           "${mod}/opt/android"
@@ -52,10 +49,6 @@
           "${mod}/system/boot/lanzaboote.nix"
           "${mod}/system/var/network/toothpc.nix"
 
-          "${mod}/hardware/toothpc.nix"
-
-          "${mod}/srv/xserver/toothpc.nix"
-
           "${mod}/opt/gaming.nix"
           {
             home-manager = {
@@ -77,9 +70,6 @@
           "${mod}/system/boot/boot.nix"
           "${mod}/system/var/network/adampad.nix"
 
-          "${mod}/hardware/adampad.nix"
-
-          "${mod}/srv/xserver/adampad.nix"
           "${mod}/srv/blueman"
 
           "${mod}/opt/android"