diff --git a/flake.nix b/flake.nix
index 53e592aa..d5a7b709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
         };
 
         nixosModules = {
-          nvf = import ./flake/modules/nixos.nix self.packages lib inputs;
+          nvf = import ./flake/modules/nixos.nix {inherit lib self;};
           default = self.nixosModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index b53d4fc9..ecc173a1 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -1,9 +1,13 @@
 # NixOS module
-packages: lib: inputs: {
+{
+  self,
+  lib,
+}: {
   config,
   pkgs,
   ...
 }: let
+  inherit (self) inputs packages;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;