diff --git a/flake.nix b/flake.nix
index 9bf43bb..ee90a68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,15 +18,20 @@
       inputs.home-manager.follows = "home-manager";
     };
   };
-
-  outputs = { nixpkgs, home-manager, homeage, agenix, nur, ... }: {
+  
+  outputs = { self, nixpkgs, home-manager, homeage, agenix, nur, ... }:
+  let
+    inherit (self) outputs;
+  in
+  {
     nixosConfigurations.pim = nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit outputs; };
       system =  "x86_64-linux";
       modules = [
+        { nixpkgs.overlays = [ nur.overlay ]; }
         ./configuration.nix
         agenix.nixosModules.default
         home-manager.nixosModules.home-manager {
-          home-manager.extraSpecialArgs = { inherit nur; };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.users.pim = {
diff --git a/home/default.nix b/home/default.nix
index 68f3207..2adbf44 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,13 +1,10 @@
-{ pkgs, nur, ... }:
+{ pkgs, ... }:
 
-let
-  nur-no-pkgs = import (nur) { inherit pkgs; nurpkgs = pkgs; };
-in
 {
   imports = [
     ./bash
     ./neovim
-    (import ./firefox nur-no-pkgs) # TODO: bit of a hack, but better than before
+    ./firefox
     ./ssh
     ./syncthing
     ./alacritty
diff --git a/home/firefox/addons.nix b/home/firefox/addons.nix
index cc519fd..38cf1ff 100644
--- a/home/firefox/addons.nix
+++ b/home/firefox/addons.nix
@@ -1,7 +1,7 @@
-{ nurpkgs, lib, ... }@args:
+pkgs: lib:
 let
-  rycee-addons = nurpkgs.repos.rycee.firefox-addons;
-  custom-addons = import ./custom-addons.nix args;
+  rycee-addons = pkgs.nur.repos.rycee.firefox-addons;
+  custom-addons = import ./custom-addons.nix pkgs lib;
 in
   {
     default = lib.concatLists [
diff --git a/home/firefox/custom-addons.nix b/home/firefox/custom-addons.nix
index 6b0dec1..ed14f16 100644
--- a/home/firefox/custom-addons.nix
+++ b/home/firefox/custom-addons.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+pkgs: lib:
 let
   # Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix
   buildFirefoxXpiAddon = lib.makeOverridable ({ stdenv ? pkgs.stdenv, fetchurl ? pkgs.fetchurl,
diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index d5825b3..9778057 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -1,8 +1,7 @@
-nurpkgs:
-{ pkgs, lib, ... }@args:
+{ pkgs, lib, ... }:
 
 let
-  firefoxAddons = import ./addons.nix (args // { inherit nurpkgs; });
+  firefoxAddons = import ./addons.nix pkgs lib;
   firefoxSettings = {
     "browser.aboutConfig.showWarning" = false;
     "browser.toolbars.bookmarks.visibility" = "always";