diff --git a/configuration.nix b/configuration.nix
index e99ad9d..9247800 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,6 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  server,
+  ...
+}: {
   imports = [
-    ./hardware-configuration.nix
+    server.hardware-configuration
   ];
 
   boot.loader = {
diff --git a/flake.nix b/flake.nix
index 86c591c..301d2cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,18 +5,32 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    ...
-  } @ attrs: {
-    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
-    nixosConfigurations.jefke = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = attrs;
-      modules = [
-        ./configuration.nix
-      ];
+  outputs = {nixpkgs, ...}: let
+    servers = {
+      jefke = {
+        hardware-configuration = import ./hardware-configuration/jefke.nix;
+        system-arch = "x86_64-linux";
+      };
     };
+    serverNames = builtins.attrNames servers;
+    serverWithNameAttr = name: (builtins.getAttr name servers) // {name = name;};
+
+    genNixosConfigurations = config:
+      nixpkgs.lib.genAttrs serverNames (
+        serverName:
+          nixpkgs.lib.nixosSystem (config (serverWithNameAttr serverName))
+      );
+  in {
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
+
+    nixosConfigurations = genNixosConfigurations (
+      server: {
+        system = server.system-arch;
+        specialArgs = {inherit server;};
+        modules = [
+          ./configuration.nix
+        ];
+      }
+    );
   };
 }
diff --git a/hardware-configuration.nix b/hardware-configuration/jefke.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hardware-configuration/jefke.nix