diff --git a/home-manager/opdavies/lemp11.nix b/home-manager/opdavies/lemp11.nix
index 1917a2db..de3a13fd 100644
--- a/home-manager/opdavies/lemp11.nix
+++ b/home-manager/opdavies/lemp11.nix
@@ -6,7 +6,6 @@
 
     desktop.media = {
       handbrake.enable = true;
-      makemkv.enable = true;
       mpv.enable = true;
     };
   };
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 338ae72f..a9a533ec 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -44,7 +44,6 @@
 
       media = {
         handbrake.enable = true;
-        makemkv.enable = true;
         mpv.enable = true;
       };
     };
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index a8387610..a3c40dbd 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -18,10 +18,6 @@
     ../../users/eric.nix
   ];
 
-  features = {
-    desktop.media.makemkv.enable = true;
-  };
-
   nixpad.enable = true;
 
   # Bootloader.
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index d37ada8e..7a2705b7 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -33,7 +33,6 @@
     desktop = {
       dconf.enable = true;
       dwm.enable = true;
-      media.makemkv.enable = true;
       st.enable = true;
     };
   };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 50cd8d69..02168d8d 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -12,7 +12,6 @@
     ./gnupg.nix
     ./gtk.nix
     ./media/handbrake.nix
-    ./media/makemkv.nix
     ./media/mpv.nix
     ./neovim
     ./node.nix
diff --git a/modules/home-manager/media/makemkv.nix b/modules/home-manager/media/makemkv.nix
deleted file mode 100644
index 01ee6c04..00000000
--- a/modules/home-manager/media/makemkv.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.media.makemkv;
-in
-{
-  options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      makemkv
-    ];
-  };
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 0f1a57e0..e4c7c511 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,7 +6,6 @@
     ./gitea-actions-runner.nix
     ./gnupg.nix
     ./kanata.nix
-    ./media
     ./nix-index.nix
     ./nixpad
     ./pipewire.nix
diff --git a/modules/nixos/media/default.nix b/modules/nixos/media/default.nix
deleted file mode 100644
index 2efff1fb..00000000
--- a/modules/nixos/media/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./makemkv.nix
-  ];
-}
diff --git a/modules/nixos/media/makemkv.nix b/modules/nixos/media/makemkv.nix
deleted file mode 100644
index 2b25b7aa..00000000
--- a/modules/nixos/media/makemkv.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.desktop.media.makemkv;
-in
-{
-  options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
-
-  config = mkIf cfg.enable {
-    boot.kernelModules = [ "sg" ];
-
-    users.users.opdavies.extraGroups = [ "cdrom" ];
-  };
-}
diff --git a/modules2/makemkv.nix b/modules2/makemkv.nix
new file mode 100644
index 00000000..9e6912a8
--- /dev/null
+++ b/modules2/makemkv.nix
@@ -0,0 +1,13 @@
+{ config, ... }:
+
+{
+  flake.modules.nixos.pc =
+    { pkgs, ... }:
+    {
+      boot.kernelModules = [ "sg" ];
+
+      environment.systemPackages = with pkgs; [ makemkv ];
+
+      users.users.${config.flake.meta.owner.username}.extraGroups = [ "cdrom" ];
+    };
+}