diff --git a/Makefile b/Makefile
index e59e468..4815ff2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ MAKEFLAGS += --no-builtin-rules
 HOSTNAME ?= $(shell hostname)
 UNAME_S := $(shell uname -s)
 
+export NIXPKGS_ALLOW_UNFREE := 1
+
 ifeq ($(UNAME_S),Linux)
 	SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' \
 								--impure # Impure because of: https://discourse.nixos.org/t/vscode-remote-wsl-extension-works-on-nixos-without-patching-thanks-to-nix-ld/14615
diff --git a/flake.lock b/flake.lock
index 4f8ca28..b30fa3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695114819,
-        "narHash": "sha256-/aIfbZxP39QZ8m7qX2RzQTy5PWzz2e22cCcZ+AOO7lA=",
+        "lastModified": 1695686713,
+        "narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "afeddc412b3a3b0e7c9ef7ea5fbdf2186781d102",
+        "rev": "e236a1e598a9a59265897948ac9874c364b9555f",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1695109627,
-        "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=",
+        "lastModified": 1695541019,
+        "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a",
+        "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1695132891,
-        "narHash": "sha256-cJR9AFHmt816cW/C9necLJyOg/gsnkvEeFAfxgeM1hc=",
+        "lastModified": 1695318763,
+        "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8b5ab8341e33322e5b66fb46ce23d724050f6606",
+        "rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1694937365,
-        "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=",
+        "lastModified": 1695559356,
+        "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02",
+        "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
         "type": "github"
       },
       "original": {
diff --git a/modules/common/linux.nix b/modules/common/linux.nix
index 7f8dd4d..2787e71 100644
--- a/modules/common/linux.nix
+++ b/modules/common/linux.nix
@@ -12,11 +12,6 @@
   nix.extraOptions = "experimental-features = nix-command flakes";
   nix.package = pkgs.nixUnstable;
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    permittedInsecurePackages = [];
-  };
-
   users.users.dave = {
     isNormalUser = true;
     extraGroups = ["docker" "wheel" "libvirtd" "corectrl"];
diff --git a/modules/machines/hephaestus/configuration.nix b/modules/machines/hephaestus/configuration.nix
index 46f0003..5030f93 100644
--- a/modules/machines/hephaestus/configuration.nix
+++ b/modules/machines/hephaestus/configuration.nix
@@ -7,6 +7,8 @@
 
   hardware.opengl.enable = true;
 
+  nixpkgs.config.allowUnfree = true;
+
   networking = {
     hostName = "hephaestus";
     interfaces.enp34s0 = {
diff --git a/modules/packages/linux-desktop.nix b/modules/packages/linux-desktop.nix
index 0d3c475..31651b5 100644
--- a/modules/packages/linux-desktop.nix
+++ b/modules/packages/linux-desktop.nix
@@ -36,14 +36,16 @@ in {
       google-cloud-sdk
       kazam
       legendary-gl
-      prismlauncher
       obs-studio
       pavucontrol
       podman
+      prismlauncher
       qemu
       ryujinx
-      signal-desktop
       steam-tui
+      unstable.signal-desktop
+      unstable.yuzu
+      unstable.zoom-us
       usbutils
       virt-manager
       vlc
@@ -51,8 +53,6 @@ in {
       wine64
       wireshark-qt
       yaru-theme
-      unstable.yuzu
-      zoom-us
     ];
   in
     linuxDesktop;
diff --git a/outputs.nix b/outputs.nix
index f8cd15b..a47c961 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -63,8 +63,8 @@
       })
     ];
     desktopLinuxModules = [
-      ./modules/common/linux-desktop.nix
       ./modules/common/linux.nix
+      ./modules/common/linux-desktop.nix
       ./modules/common/networking.nix
       ./modules/common/printing.nix
       ./modules/packages/linux-desktop.nix