diff --git a/flake.nix b/flake.nix
index b978fb0..5a9af83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
@@ -17,7 +18,6 @@
         home-manager.follows = "";
       };
     };
-    flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     nur.url = "github:nix-community/NUR";
@@ -125,8 +125,7 @@
       inputs.golink.overlay
     ];
     pkgs = import nixpkgs {
-      inherit overlays;
-      system = "x86_64-linux";
+      inherit overlays system;
       config.allowUnfree = true;
     };
     userSecret = path: {
@@ -191,123 +190,118 @@
       })
     ];
     username = "jolheiser";
-  in
-    {
-      homeConfigurations = let
-        commonModules = [
-          {
-            home = {
-              inherit username;
-              homeDirectory = "/home/${username}";
-            };
-          }
-          ./apps/gui
-        ];
-      in {
-        "jolheiser" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = commonModules;
-        };
-        "work" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules =
-            commonModules
-            ++ [
-              {
-                nixpkgs.overlays = [
-                  (_: _: {
-                    py39 = import nixpkgs-py39 {inherit (pkgs) system;};
-                  })
-                ];
-                programs = {
-                  git.package = pkgs.gitSVN;
-                  firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
-                };
-              }
-            ];
-        };
-      };
-      nixosConfigurations = {
-        "chai" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules =
-            workModules
-            ++ [
-              ./machines/chai
-            ];
-        };
-        "earlgrey" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules =
-            workModules
-            ++ [
-              ./machines/earlgrey
-            ];
-        };
-        "masala" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules =
-            workModules
-            ++ [
-              wsl.nixosModules.wsl
-              ./machines/masala
-            ];
-        };
-        "matcha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            agenix.nixosModules.default
-            ./machines/matcha
-            commonConfig
-          ];
-        };
-        "genmaicha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            nixos-hardware.nixosModules.framework-13-7040-amd
-            agenix.nixosModules.default
-            ./machines/genmaicha
-            commonConfig
-          ];
-        };
-        "sencha" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            agenix.nixosModules.default
-            ./machines/sencha
-            commonConfig
-          ];
-        };
-      };
-      colmena = {
-        meta = {
-          nixpkgs = import nixpkgs {
-            system = "x86_64-linux";
-            overlays = overlays;
+    system = "x86_64-linux";
+  in {
+    homeConfigurations = let
+      commonModules = [
+        {
+          home = {
+            inherit username;
+            homeDirectory = "/home/${username}";
           };
-        };
-        dragonwell = {
-          imports = [
-            inputs.agenix.nixosModules.default
-            inputs.golink.nixosModules.default
-            inputs.ugit.nixosModules.default
-            ./machines/dragonwell
-          ];
-        };
-      };
-      nixConfig = {
-        extra-substitutors = ["https://jolheiser.cachix.org"];
-        extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
-      };
-    }
-    // inputs.flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
+        }
+        ./apps/gui
+      ];
     in {
-      devShells.default = pkgs.mkShell {
-        nativeBuildInputs = [
-          agenix.packages.${system}.agenix
-          pkgs.colmena
+      "jolheiser" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = commonModules;
+      };
+      "work" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules =
+          commonModules
+          ++ [
+            {
+              nixpkgs.overlays = [
+                (_: _: {
+                  py39 = import nixpkgs-py39 {inherit (pkgs) system;};
+                })
+              ];
+              programs = {
+                git.package = pkgs.gitSVN;
+                firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
+              };
+            }
+          ];
+      };
+    };
+    nixosConfigurations = {
+      "chai" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules =
+          workModules
+          ++ [
+            ./machines/chai
+          ];
+      };
+      "earlgrey" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules =
+          workModules
+          ++ [
+            ./machines/earlgrey
+          ];
+      };
+      "masala" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules =
+          workModules
+          ++ [
+            wsl.nixosModules.wsl
+            ./machines/masala
+          ];
+      };
+      "matcha" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          agenix.nixosModules.default
+          ./machines/matcha
+          commonConfig
         ];
       };
-    });
+      "genmaicha" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          nixos-hardware.nixosModules.framework-13-7040-amd
+          agenix.nixosModules.default
+          ./machines/genmaicha
+          commonConfig
+        ];
+      };
+      "sencha" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          agenix.nixosModules.default
+          ./machines/sencha
+          commonConfig
+        ];
+      };
+    };
+    colmena = {
+      meta = {
+        nixpkgs = import nixpkgs {
+          inherit overlays system;
+        };
+      };
+      dragonwell = {
+        imports = [
+          inputs.agenix.nixosModules.default
+          inputs.golink.nixosModules.default
+          inputs.ugit.nixosModules.default
+          ./machines/dragonwell
+        ];
+      };
+    };
+    nixConfig = {
+      extra-substitutors = ["https://jolheiser.cachix.org"];
+      extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
+    };
+    devShells.${system}.default = pkgs.mkShell {
+      nativeBuildInputs = [
+        agenix.packages.${system}.agenix
+        pkgs.colmena
+      ];
+    };
+  };
 }