diff --git a/flake.in.nix b/flake.in.nix
index 5b786ed..94089d3 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -108,14 +108,7 @@
         with inputs."nixpkgs-${branch}".lib;
           nixosSystem {
             system = arch;
-
-            specialArgs = {
-              inherit inputs;
-
-              # Pass home-manager lib through nixpkgs lib
-              #?? lib.home-manager.*
-              lib = recursiveUpdate inputs."nixpkgs-${branch}".lib {home-manager = inputs."home-manager-${branch}".lib;};
-            };
+            specialArgs = {inherit inputs;};
 
             # TODO: Clean up optional attributes with each new release
             #!! Options will diverge between branches over time
diff --git a/options/custom/programs/discord.nix b/options/custom/programs/discord.nix
index 3d23a1b..28e7886 100644
--- a/options/custom/programs/discord.nix
+++ b/options/custom/programs/discord.nix
@@ -5,13 +5,14 @@
 }:
 with lib; let
   cfg = config.custom.programs.discord;
+  hm = config.home-manager.users.${config.custom.username};
 in {
   options.custom.programs.discord.enable = mkOption {default = false;};
 
   config.home-manager.users.myned = mkIf cfg.enable {
     xdg.configFile."BetterDiscord" = {
       force = true;
-      source = config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/discord/BetterDiscord";
+      source = hm.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/discord/BetterDiscord";
     };
   };
 }
diff --git a/options/custom/programs/libreoffice.nix b/options/custom/programs/libreoffice.nix
index 963d8e0..7ee1d23 100644
--- a/options/custom/programs/libreoffice.nix
+++ b/options/custom/programs/libreoffice.nix
@@ -6,6 +6,7 @@
 }:
 with lib; let
   cfg = config.custom.programs.libreoffice;
+  hm = config.home-manager.users.${config.custom.username};
 in {
   options.custom.programs.libreoffice = {
     enable = mkOption {default = false;};
@@ -20,7 +21,7 @@ in {
     home-manager.users.${config.custom.username} = {
       xdg.configFile."libreoffice/4/user" = {
         force = true;
-        source = config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/linux/config/libreoffice/user";
+        source = hm.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/linux/config/libreoffice/user";
       };
     };
   };
diff --git a/options/custom/programs/logseq.nix b/options/custom/programs/logseq.nix
index e4c0c83..9d6558f 100644
--- a/options/custom/programs/logseq.nix
+++ b/options/custom/programs/logseq.nix
@@ -5,6 +5,7 @@
 }:
 with lib; let
   cfg = config.custom.programs.logseq;
+  hm = config.home-manager.users.${config.custom.username};
 in {
   options.custom.programs.logseq.enable = mkOption {default = false;};
 
@@ -12,7 +13,7 @@ in {
     #!! Synced imperative configuration
     home.file.".logseq/" = {
       force = true;
-      source = config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/logseq/";
+      source = hm.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/logseq/";
     };
   };
 }
diff --git a/options/custom/programs/obs-studio.nix b/options/custom/programs/obs-studio.nix
index ec82e9e..f7c5dd4 100644
--- a/options/custom/programs/obs-studio.nix
+++ b/options/custom/programs/obs-studio.nix
@@ -5,6 +5,7 @@
 }:
 with lib; let
   cfg = config.custom.programs.obs-studio;
+  hm = config.home-manager.users.${config.custom.username};
 in {
   options.custom.programs.obs-studio.enable = mkOption {default = false;};
 
@@ -12,6 +13,6 @@ in {
     # https://github.com/obsproject/obs-studio
     programs.obs-studio.enable = true;
 
-    xdg.configFile."obs-studio".source = config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/obs-studio";
+    xdg.configFile."obs-studio".source = hm.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/common/config/obs-studio";
   };
 }
diff --git a/options/custom/programs/remmina.nix b/options/custom/programs/remmina.nix
index cb4349a..1016383 100644
--- a/options/custom/programs/remmina.nix
+++ b/options/custom/programs/remmina.nix
@@ -5,6 +5,7 @@
 }:
 with lib; let
   cfg = config.custom.programs.remmina;
+  hm = config.home-manager.users.${config.custom.username};
 in {
   options.custom.programs.remmina.enable = mkOption {default = false;};
 
@@ -13,7 +14,7 @@ in {
       #!! Imperative configuration
       xdg.configFile."remmina/remmina.pref" = {
         force = true;
-        source = config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/linux/config/remmina/remmina.pref";
+        source = hm.lib.file.mkOutOfStoreSymlink "${config.custom.sync}/linux/config/remmina/remmina.pref";
       };
     };
   };
diff --git a/options/custom/settings/fonts.nix b/options/custom/settings/fonts.nix
index 08c804c..a4a2cc5 100644
--- a/options/custom/settings/fonts.nix
+++ b/options/custom/settings/fonts.nix
@@ -6,6 +6,7 @@
 }:
 with lib; let
   cfg = config.custom.settings.fonts;
+  hm = config.home-manager.users.${config.custom.username};
 
   rsync = getExe pkgs.rsync;
 in {
@@ -101,7 +102,7 @@ in {
         home.activation = {
           # BUG: rsync sets directory permissions too early
           # https://github.com/RsyncProject/rsync/issues/609
-          copy-fonts = lib.home-manager.hm.dag.entryAfter ["writeBoundary"] ''
+          copy-fonts = hm.lib.dag.entryAfter ["writeBoundary"] ''
             run ${rsync} --recursive --copy-links --times \
               /run/current-system/sw/share/fonts "$XDG_DATA_HOME/"
           '';