diff --git a/flake.lock b/flake.lock
index f7d4fe1..0feaeeb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,26 @@
         "url": "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"
       }
     },
+    "homeage": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669234151,
+        "narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=",
+        "owner": "jordanisaacs",
+        "repo": "homeage",
+        "rev": "02bfe4ca06962d222e522fff0240c93946b20278",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jordanisaacs",
+        "repo": "homeage",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1696697597,
@@ -50,6 +70,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "homeage": "homeage",
         "nixpkgs": "nixpkgs",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 6826b01..dad1de9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,10 @@
       url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    homeage = {
+      url = "github:jordanisaacs/homeage";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { nixpkgs, home-manager, nur, ... }: {
@@ -15,9 +19,11 @@
       pim = nixpkgs.lib.nixosSystem {
         system =  "x86_64-linux";
         modules = [
-          { nixpkgs.overlays = [ nur.overlay ]; }
-          (args: home-manager.nixosModules.home-manager {
-            inherit (args) lib pkgs config utils;
+          ./configuration.nix
+          # { nixpkgs.overlays = [ nur.overlay ]; }
+          # (args: home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager {
+            # inherit (args) lib pkgs config utils;
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.pim = {
@@ -25,8 +31,7 @@
                 ./home/home.nix
               ];
             };
-          })
-          ./configuration.nix
+          }
         ];
       };
     };
diff --git a/home/firefox/addons.nix b/home/firefox/addons.nix
index 773871f..2527bf5 100644
--- a/home/firefox/addons.nix
+++ b/home/firefox/addons.nix
@@ -1,6 +1,6 @@
-{pkgs, lib, ...}@args:
+{nurpkgs, lib, ...}@args:
 let
-  rycee-addons = pkgs.repos.rycee.firefox-addons;
+  rycee-addons = nurpkgs.repos.rycee.firefox-addons;
   custom-addons = import ./custom-addons.nix args;
 in
   {
diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index 18ba4a3..184a22f 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -1,7 +1,8 @@
-args:
+{pkgs, ...}@args:
 
 let
-  firefoxAddons = import ./addons.nix args;
+  nurpkgs = import (builtins.fetchTarball {url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; sha256 = "1gb3wkmyl6xbs4kval2ml48nlil39853dj62rxfrlk9i2nky2ly4"; }) { inherit pkgs; };
+  firefoxAddons = import ./addons.nix  (args // {inherit nurpkgs; });
   firefoxSettings = {
     "browser.aboutConfig.showWarning" = false;
     "browser.toolbars.bookmarks.visibility" = "always";