diff --git a/flake.nix b/flake.nix
index ab6d122..59bc72c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,31 @@
     ...
   } @ inputs: let
     forAllSystems = nixpkgs.lib.genAttrs ["x86_64-linux" "aarch64-linux"];
-    pkgsForEach = nixpkgs.legacyPackages;
+    pkgsForEach = forAllSystems (system:
+      import nixpkgs {
+        localSystem.system = system;
+        overlays = [self.overlays.default];
+      });
   in {
-    packages = forAllSystems (system: {
-      superfreq = pkgsForEach.${system}.callPackage ./nix/package.nix {};
-      default = self.packages.${system}.superfreq;
-    });
+    overlays = {
+      superfreq = final: _: {
+        superfreq = final.callPackage ./nix/package.nix {};
+      };
+      default = self.overlays.superfreq;
+    };
 
-    devShells = forAllSystems (system: {
-      default = pkgsForEach.${system}.callPackage ./nix/shell.nix {};
-    });
+    packages =
+      nixpkgs.lib.mapAttrs (system: pkgs: {
+        inherit (pkgs) superfreq;
+        default = self.packages.${system}.superfreq;
+      })
+      pkgsForEach;
+
+    devShells =
+      nixpkgs.lib.mapAttrs (system: pkgs: {
+        default = pkgs.callPackage ./nix/shell.nix {};
+      })
+      pkgsForEach;
 
     nixosModules = {
       superfreq = import ./nix/module.nix inputs;