diff --git a/modules/nur.nix b/modules/nur-and-unstable.nix
similarity index 76%
rename from modules/nur.nix
rename to modules/nur-and-unstable.nix
index 598aca1..90a0d1a 100644
--- a/modules/nur.nix
+++ b/modules/nur-and-unstable.nix
@@ -7,11 +7,15 @@
   #  };
   #};
 
-  # Import NUR with niv.
   nixpkgs.config.packageOverrides = pkgs: {
+    # Import NUR with niv.
     nur = import (import ../nix/sources.nix).NUR {
       inherit pkgs;
     };
+    # Import unstable with niv.
+    unstable = import (import ../nix/sources.nix).unstable {
+      inherit pkgs;
+    };
   };
 
   # Test if NUR was imported successfully.
diff --git a/modules/signal-desktop.nix b/modules/signal-desktop.nix
index 9b156df..3722f4f 100644
--- a/modules/signal-desktop.nix
+++ b/modules/signal-desktop.nix
@@ -1,12 +1,5 @@
 { config, pkgs, lib, ... }:
 {
-  # Import unstable with niv.
-  nixpkgs.config.packageOverrides = pkgs: {
-    unstable = import (import ../nix/sources.nix).unstable {
-      inherit pkgs;
-    };
-  };
-
   users.users.yoda = {
     packages = with pkgs; [
       signal-desktop-beta # Signal client