diff --git a/flake.nix b/flake.nix
index 005f9f8..5665fce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,19 +37,24 @@
     lanzaboote,
     ...
   } @ inputs: let
-    modules' = [ragenix.nixosModules.default lanzaboote.nixosModules.lanzaboote];
-  in {
-    nixosConfigurations.fuji = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [./fuji] ++ modules';
-      specialArgs = inputs;
-    };
+    mkSystem = name:
+      nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./common.nix
 
-    nixosConfigurations.kilimandjaro = inputs.nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [./kilimandjaro] ++ modules';
-      specialArgs = inputs;
-    };
+          ./${name}
+          ./${name}/hardware-configuration.nix
+
+          {networking.hostName = name;}
+
+          ragenix.nixosModules.default
+          lanzaboote.nixosModules.lanzaboote
+        ];
+        specialArgs = inputs;
+      };
+  in {
+    nixosConfigurations = nixpkgs.lib.genAttrs ["fuji" "kilimandjaro"] mkSystem;
 
     formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
   };
diff --git a/fuji/default.nix b/fuji/default.nix
index 32f4e45..7288856 100644
--- a/fuji/default.nix
+++ b/fuji/default.nix
@@ -1,11 +1,4 @@
-{...}: {
-  imports = [
-    ../common.nix
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "fuji";
-
+_: {
   services.xserver.videoDrivers = ["amdgpu"];
 
   # services.xserver.videoDrivers = ["nvidia"];
diff --git a/kilimandjaro/default.nix b/kilimandjaro/default.nix
index 12b7e2d..57e8e5e 100644
--- a/kilimandjaro/default.nix
+++ b/kilimandjaro/default.nix
@@ -1,11 +1,4 @@
 {pkgs, ...}: {
-  imports = [
-    ../common.nix
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "kilimandjaro";
-
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;