diff --git a/nixos/thor.nix b/nixos/thor.nix
index 04c6caf..b944b99 100644
--- a/nixos/thor.nix
+++ b/nixos/thor.nix
@@ -177,7 +177,12 @@
       };
     };
   };
-  nix.gc.automatic = true;
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes)
+      "experimental-features = nix-command flakes";
+    gc.automatic = true;
+  };
 
   system.stateVersion = "21.05"; # Did you read the comment?
 }
diff --git a/odin.nix b/odin.nix
index 659e5df..9d30c1e 100644
--- a/odin.nix
+++ b/odin.nix
@@ -84,6 +84,7 @@
       krita
       # lutris
       meld
+      mmv-go
       mpv
       neofetch
       nix-prefetch-scripts
diff --git a/thor.nix b/thor.nix
index 9c84826..df5e171 100644
--- a/thor.nix
+++ b/thor.nix
@@ -82,9 +82,10 @@
       jetbrains.datagrip
       keepassxc
       krita
-      # lutris
+      lutris
       mangohud
       meld
+      mmv-go
       mpv
       neofetch
       nix-prefetch-scripts