diff --git a/flake.nix b/flake.nix
index c9b8c97a..f9713fa7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
         system:
         import nixpkgs {
           inherit system;
-          overlays = [ packageOverlay ];
+          overlays = [ self.overlays.default ];
         }
       );
       eachSystem =
@@ -46,10 +46,6 @@
             pkgs = pkgsFor.${system};
           }
         );
-      packageOverlay = final: _prev: rec {
-        system-manager-unwrapped = final.callPackage ./package.nix { };
-        system-manager = final.callPackage ./nix/packages/wrapper.nix { inherit system-manager-unwrapped; };
-      };
     in
     {
       lib = (import ./nix/lib.nix { inherit nixpkgs userborn; }) // {
@@ -69,7 +65,7 @@
       # Documentation outputs
       docs = eachSystem ({ pkgs, ... }: import ./docs/options.nix { inherit pkgs; });
 
-      overlays.default = packageOverlay;
+      overlays.default = import ./nix/overlays;
 
       # Only useful for quick tests
       systemConfigs.default = self.lib.makeSystemConfig {
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
new file mode 100644
index 00000000..636129a9
--- /dev/null
+++ b/nix/overlays/default.nix
@@ -0,0 +1,6 @@
+final: _prev: {
+  system-manager-unwrapped = final.callPackage ../../package.nix { };
+  system-manager = final.callPackage ../packages/wrapper.nix {
+    inherit (final) system-manager-unwrapped;
+  };
+}