diff --git a/default.nix b/default.nix
index 5cf7c3e3ba3b08587430f4f0680a8779dd681c0b..373379f9a65eed749736838ebf3327eb8617431a 100644
--- a/default.nix
+++ b/default.nix
@@ -3,7 +3,7 @@   pkgs ? import <nixpkgs> { },
 }:
 let
   tomlFormat = pkgs.formats.toml { };
-  config = import ./config { inherit pkgs; };
+  config = import ./config { pkgs = pkgs; };
   buildGrammar =
     grammar:
     let
diff --git a/flake.nix b/flake.nix
index 03bf349ae1cf4f151eb10e4ba479e048f25623fa..ca429c7dcf27246c9392a7e27f1f17c582bed141 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@       forAllSystems = f: nixpkgs.lib.genAttrs systems f;
     in
     {
       packages = forAllSystems (
-        system: import ./default.nix { pkgs = nixpkgs.legacyPackages.${system}; }
+        system: import ./default.nix { pkgs = import nixpkgs { inherit system; }; }
       );
     };
 }