diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index 270356d7..71959579 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -1,21 +1,17 @@
-{ inputs, self, ... }:
+{ self, ... }:
 
 {
   perSystem =
-    { pkgs, system, ... }:
-    let
-      # TODO: refactor to use inputs' or similar.
-      nixvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
-        inherit pkgs;
-
-        module = import "${self}/modules/home-manager/coding/neovim/config";
-      };
-    in
+    { inputs', pkgs, ... }:
     {
       packages = {
-        inherit nixvim;
-
         default = pkgs.mkShell { buildInputs = with pkgs; [ just ]; };
+
+        nixvim = inputs'.nixvim.legacyPackages.makeNixvimWithModule {
+          inherit pkgs;
+
+          module = import "${self}/modules/home-manager/coding/neovim/config";
+        };
       };
     };
 }