diff --git a/flake.nix b/flake.nix
index 438e969..ded59b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     home-manager.url = "github:nix-community/home-manager/master";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     flatpaks.url = "github:gmodena/nix-flatpak/main";
     anyrun.url = "github:anyrun-org/anyrun";
     niri.url = "github:sodiboo/niri-flake";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     anyrun.inputs.nixpkgs.follows = "nixpkgs";
     niri.inputs.nixpkgs.follows = "nixpkgs";
   };
@@ -14,7 +14,6 @@
     nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./ahrc-pc/configuration.nix
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
@@ -25,13 +24,13 @@
             ./ahrc-pc/home.nix
           ];
         }
+        ./ahrc-pc/configuration.nix
       ];
     };
 
     nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./ahrc-laptop/configuration.nix
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
@@ -43,6 +42,7 @@
             ./ahrc-laptop/home.nix
           ];
         }
+        ./ahrc-laptop/configuration.nix
       ];
     };
   };