diff --git a/assets/ssh.nix b/assets/ssh.nix
index 1a4ec32..fb8a04d 100644
--- a/assets/ssh.nix
+++ b/assets/ssh.nix
@@ -14,6 +14,7 @@
     ude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDm3M/i/4wP2BM4+9hHAOMospwvlBZ+FT+pJtVgaaMq nikodem@rabulinski.com";
     kogata = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGK7H4Z29d72HJlI69Vt0YLOyuPcn9XxYjvMZfql80z0 nikodem@rabulinski.com";
     hijiri = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFXVPUBYAMn9H3efG/ldWl/ySmZV0CXleyH7E5nKf/N7 nikodem@rabulinski.com";
+    tsukasa = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPKXcihNVgsStMstnZYvh+Ai+JsydX3vu4O0yhlN+zw niko@tsukasa";
   };
 
   system = {
@@ -23,5 +24,6 @@
     ude = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZW15ObZ6XG776pdEvs9yqSuIiWlbGveEVA774Ri9/o root@ude";
     kogata = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPN/SXBcIB1WN8GIhYrQrqzFGuVkEP4o0E+x0uQ4f2l";
     hijiri = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILsTkICNuUwGqrToisTViFCBoql39+DFYVZSWj7vfbXK";
+    tsukasa = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKy32XGCkB0KOUm4f0ybrutfAzR7+baifM2yv5KuYV7 root@tsukasa";
   };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index 3c334c3..a245e1c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -29,30 +29,15 @@
 
       baseNixos = inputs.nixpkgs.lib.nixosSystem {
         modules = [
-          inputs.agenix.nixosModules.age
-          inputs.disko.nixosModules.disko
-          inputs.mailserver.nixosModules.default
-          inputs.home-manager.nixosModules.home-manager
-          inputs.nvidia-patch.nixosModules.nvidia-patch
-          inputs.attic.nixosModules.atticd
-          inputs.lix-module.nixosModules.default
-          self.nixosModules.settei
+          self.nixosModules.combined
           sharedOptions
-          {
-            disabledModules = [
-              "services/networking/atticd.nix"
-            ];
-          }
         ];
         specialArgs.configurationName = "base";
       };
 
       baseDarwin = inputs.darwin.lib.darwinSystem {
         modules = [
-          inputs.agenix.darwinModules.age
-          inputs.home-manager.darwinModules.home-manager
-          inputs.lix-module.nixosModules.default
-          self.darwinModules.settei
+          self.darwinModules.combined
           sharedOptions
         ];
         specialArgs.configurationName = "base";
diff --git a/modules/default.nix b/modules/default.nix
index ac793fe..32f8e5f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -26,7 +26,24 @@ in
       inherit (config) perInput;
       isLinux = true;
     };
-    default = settei;
+    combined = {
+      imports = [
+        settei
+        inputs.agenix.nixosModules.age
+        inputs.disko.nixosModules.disko
+        inputs.mailserver.nixosModules.default
+        inputs.home-manager.nixosModules.home-manager
+        inputs.nvidia-patch.nixosModules.nvidia-patch
+        inputs.attic.nixosModules.atticd
+        inputs.lix-module.nixosModules.default
+        {
+          disabledModules = [
+            "services/networking/atticd.nix"
+          ];
+        }
+      ];
+    };
+    default = combined;
   };
 
   flake.darwinModules = rec {
@@ -34,6 +51,14 @@ in
       inherit (config) perInput;
       isLinux = false;
     };
-    default = settei;
+    combined = {
+      imports = [
+        settei
+        inputs.agenix.darwinModules.age
+        inputs.home-manager.darwinModules.home-manager
+        inputs.lix-module.nixosModules.default
+      ];
+    };
+    default = combined;
   };
 }