diff --git a/flake.lock b/flake.lock
index 20acfed..90554b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -186,11 +186,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1736344531,
-        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739557722,
-        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
+        "lastModified": 1740569341,
+        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
+        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ec0d0e3..a5ea6c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,13 +36,7 @@
           nix.registry.unstable.flake = nixpkgs-unstable;
           system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
         };
-        home-module =
-          system: config: {
-            home-manager = {
-              sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.${config.user} = import ./home-manager/all.nix {
+        module-opts = system: config: {
                 pkgs = import nixpkgs {
                   inherit system;
                   config.allowUnfree = true;
@@ -60,18 +54,24 @@
                 } // self.packages.${system};
                 inherit config;
               };
+        home-module = opts@{ config, ... }: {
+            home-manager = {
+              sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.${config.user} = import ./home-manager/all.nix opts;
             };
           };
-          user-system = import ./nixos/shared/user-system.nix;
-          graphical = import ./nixos/shared/graphical.nix;
-          graphical-with-conf = base: system: config: [
-            nix-config-module
-            home-manager.nixosModules.home-manager
-            base
-            (user-system system config)
-            (graphical   system config)
-            (home-module system config)
-          ];
+        user-system = import ./nixos/shared/user-system.nix;
+        graphical = import ./nixos/shared/graphical.nix;
+        graphical-with-conf = base: system: config: [
+          nix-config-module
+          home-manager.nixosModules.home-manager
+          (import base (module-opts system config))
+          (user-system (module-opts system config))
+          (graphical   (module-opts system config))
+          (home-module (module-opts system config))
+        ];
     in {
 
     nixosConfigurations.lambda = nixpkgs.lib.nixosSystem rec {
diff --git a/nixos/computational/configuration.nix b/nixos/computational/configuration.nix
index 6e16e2c..2e48320 100644
--- a/nixos/computational/configuration.nix
+++ b/nixos/computational/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, unstable, extra, config, ... }:
 {
   # [HARDWARE]
   imports =
@@ -106,7 +106,10 @@
     rocmOverrideGfx = "10.3.0";
   };
 
-  services.nextjs-ollama-llm-ui.enable = true;
+  services.nextjs-ollama-llm-ui = {
+    enable = true;
+    package = unstable.nextjs-ollama-llm-ui;
+  };
 
   system.stateVersion = "24.11";
 }
diff --git a/nixos/lambda/configuration.nix b/nixos/lambda/configuration.nix
index 83fe023..7c0bbb4 100644
--- a/nixos/lambda/configuration.nix
+++ b/nixos/lambda/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, unstable, extra, config, ... }:
 {
   # [HARDWARE]
   imports =
diff --git a/nixos/shared/graphical.nix b/nixos/shared/graphical.nix
index 3c0f6c1..e008aae 100644
--- a/nixos/shared/graphical.nix
+++ b/nixos/shared/graphical.nix
@@ -1,4 +1,4 @@
-system: config: { pkgs, ... }:
+{ pkgs, unstable, extra, config, ... }:
 {
   # [DESKTOP / XORG / WAYLAND]
   services.libinput = {
diff --git a/nixos/shared/user-system.nix b/nixos/shared/user-system.nix
index 4941291..d50af12 100644
--- a/nixos/shared/user-system.nix
+++ b/nixos/shared/user-system.nix
@@ -1,4 +1,4 @@
-system: config: { pkgs, ... }:
+{ pkgs, unstable, extra, config, ... }:
 {
   # [LOCALE]
   time.timeZone = "Europe/Stockholm";
diff --git a/nixos/transient/configuration.nix b/nixos/transient/configuration.nix
index 141d6ec..0c290e5 100644
--- a/nixos/transient/configuration.nix
+++ b/nixos/transient/configuration.nix
@@ -1,9 +1,4 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, ... }:
-
+{ pkgs, unstable, extra, config, ... }:
 {
   imports =
     [ # Include the results of the hardware scan.