diff --git a/config/systems/nixos76/default.nix b/config/hosts/nixos76/default.nix
similarity index 100%
rename from config/systems/nixos76/default.nix
rename to config/hosts/nixos76/default.nix
diff --git a/config/systems/nixos76/hardware-configuration.nix b/config/hosts/nixos76/hardware-configuration.nix
similarity index 100%
rename from config/systems/nixos76/hardware-configuration.nix
rename to config/hosts/nixos76/hardware-configuration.nix
diff --git a/config/systems/thelio76/default.nix b/config/hosts/thelio76/default.nix
similarity index 100%
rename from config/systems/thelio76/default.nix
rename to config/hosts/thelio76/default.nix
diff --git a/config/systems/thelio76/hardware-configuration.nix b/config/hosts/thelio76/hardware-configuration.nix
similarity index 100%
rename from config/systems/thelio76/hardware-configuration.nix
rename to config/hosts/thelio76/hardware-configuration.nix
diff --git a/flake.nix b/flake.nix
index be00fdb..a8365db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,24 +22,33 @@
   };
 
   outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@inputs:
+    let
+      pcUser = "alex";
+      pcSystem = "x86_64-linux";
+      mkPcSystem = { user, hostname, system, inputs }: nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          ./config/hosts/${hostname}
+        ] ++ (import ./config/modules/home-manager.nix {
+          inherit system inputs user;
+        }).modules;
+      };
+    in
     {
       nixosConfigurations = {
         ## ---- personal computers (linux) ----
-        nixos76 = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          modules = [
-            ./config/systems/nixos76
-          ] ++ (import ./config/modules/home-manager.nix {
-            inherit system inputs; user = "alex";
-          }).modules;
+        nixos76 = mkPcSystem {
+          hostname = "nixos76";
+          user = pcUser;
+          system = pcSystem;
+          inherit inputs;
         };
-        thelio76 = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          modules = [
-            ./config/systems/thelio76
-          ] ++ (import ./config/modules/home-manager.nix {
-            inherit system inputs; user = "alex";
-          }).modules;
+
+        thelio76 = mkPcSystem {
+          hostname = "thelio76";
+          user = pcUser;
+          system = pcSystem;
+          inherit inputs;
         };
 
         ## ---- servers ----