diff --git a/modules/common/applications/1password.nix b/modules/common/applications/1password.nix
index 13ada8a..53646e1 100644
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@@ -11,7 +11,7 @@
 
   config = lib.mkIf
     (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
-      unfreePackages = [ "1password" "_1password-gui" ];
+      unfreePackages = with pkgs; [ _1password _1password-gui ];
       home-manager.users.${config.user} = {
         home.packages = with pkgs; [ _1password-gui ];
       };
diff --git a/modules/common/applications/discord.nix b/modules/common/applications/discord.nix
index 444967c..eb39c2f 100644
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.discord.enable) {
-    unfreePackages = [ "discord" ];
+    unfreePackages = [ pkgs.discord ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ discord ];
       xdg.configFile."discord/settings.json".text = ''
diff --git a/modules/common/applications/firefox.nix b/modules/common/applications/firefox.nix
index 4b809c0..ab397f1 100644
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@@ -13,9 +13,9 @@
 
   config = lib.mkIf (config.gui.enable && config.firefox.enable) {
 
-    unfreePackages = [
-      (lib.mkIf config._1password.enable "onepassword-password-manager")
-      "okta-browser-plugin"
+    unfreePackages = with pkgs.nur.repos.rycee.firefox-addons; [
+      (lib.mkIf config._1password.enable onepassword-password-manager)
+      okta-browser-plugin
     ];
 
     home-manager.users.${config.user} = {
diff --git a/modules/common/applications/obsidian.nix b/modules/common/applications/obsidian.nix
index 6a35f6b..fe0f080 100644
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
-    unfreePackages = [ "obsidian" ];
+    unfreePackages = [ pkgs.obsidian ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ obsidian ];
     };
diff --git a/modules/common/applications/slack.nix b/modules/common/applications/slack.nix
index 4bd866f..5ffa397 100644
--- a/modules/common/applications/slack.nix
+++ b/modules/common/applications/slack.nix
@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.slack.enable) {
-    unfreePackages = [ "slack" ];
+    unfreePackages = [ pkgs.slack ];
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ slack ];
     };
diff --git a/modules/common/default.nix b/modules/common/default.nix
index fedb3ed..a49e606 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -68,7 +68,7 @@
       description = "Link to dotfiles repository.";
     };
     unfreePackages = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+      type = lib.types.listOf lib.types.package;
       description = "List of unfree packages to allow.";
       default = [ ];
     };
@@ -113,8 +113,10 @@
 
     # Allow specified unfree packages (identified elsewhere)
     # Retrieves package object based on string name
+    # Idea: https://discourse.nixos.org/t/how-to-use-packages-directly-in-allowunfreepredicate/22455/6
     nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) config.unfreePackages;
+      builtins.elem (pkg.name or (builtins.parseDrvName pkg.pname).name)
+      (map lib.getName config.unfreePackages);
 
     # Pin a state version to prevent warnings
     home-manager.users.${config.user}.home.stateVersion = stateVersion;
diff --git a/modules/nixos/gaming/minecraft-server.nix b/modules/nixos/gaming/minecraft-server.nix
index 34c6562..b1329f5 100644
--- a/modules/nixos/gaming/minecraft-server.nix
+++ b/modules/nixos/gaming/minecraft-server.nix
@@ -14,7 +14,7 @@ in {
 
   config = lib.mkIf config.gaming.minecraft-server.enable {
 
-    unfreePackages = [ "minecraft-server" ];
+    unfreePackages = [ pkgs.minecraft-server ];
 
     services.minecraft-server = {
       enable = true;
diff --git a/modules/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix
index 7bfdbcb..47754ca 100644
--- a/modules/nixos/gaming/steam.nix
+++ b/modules/nixos/gaming/steam.nix
@@ -4,7 +4,7 @@
 
   config = lib.mkIf (config.gaming.steam.enable && pkgs.stdenv.isLinux) {
     hardware.steam-hardware.enable = true;
-    unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
+    unfreePackages = with pkgs; [ steam steamcmd steam-run ];
 
     programs.steam = {
       enable = true;