diff --git a/flake.nix b/flake.nix
index 095419d5..d6e700aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
         };
 
         homeManagerModules = {
-          nvf = import ./flake/modules/home-manager.nix self.packages lib inputs;
+          nvf = import ./flake/modules/home-manager.nix {inherit lib self;};
           default = self.homeManagerModules.nvf;
           neovim-flake =
             lib.warn ''
diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index c109e774..715f7537 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -1,9 +1,13 @@
 # Home Manager module
-packages: lib: inputs: {
+{
+  self,
+  lib,
+}: {
   config,
   pkgs,
   ...
 }: let
+  inherit (self) packages inputs;
   inherit (lib) maintainers;
   inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;