diff --git a/flake.nix b/flake.nix
index e8a1b1d..e8dc8fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,6 +78,7 @@
               ./modules/system/apps-misc
               ./modules/system/browser
               ./modules/system/controller
+              ./modules/system/flatpak
               ./modules/system/jovian-${hostName}
               ./modules/system/lact
               ./modules/system/plasma
@@ -119,6 +120,7 @@
             ./modules/system/apps-misc
             ./modules/system/browser
             ./modules/system/controller
+            ./modules/system/flatpak
             ./modules/system/jovian-${hostName}
             ./modules/system/lact
             ./modules/system/plasma
@@ -157,6 +159,7 @@
             ./modules/system/apps-misc
             ./modules/system/browser
             ./modules/system/controller
+            ./modules/system/flatpak
             ./modules/system/jovian-${hostName}
             ./modules/system/lact
             ./modules/system/plasma
diff --git a/modules/system/flatpak/default.nix b/modules/system/flatpak/default.nix
new file mode 100644
index 0000000..fd1dbfc
--- /dev/null
+++ b/modules/system/flatpak/default.nix
@@ -0,0 +1,5 @@
+{ ... }:
+{
+  services.flatpak.enable = true;
+  services.flatpak.update.onActivation = true;
+}
diff --git a/modules/system/retrodeck/default.nix b/modules/system/retrodeck/default.nix
index 6c821d0..e30f802 100644
--- a/modules/system/retrodeck/default.nix
+++ b/modules/system/retrodeck/default.nix
@@ -1,7 +1,5 @@
 { ... }:
 {
-  services.flatpak.enable = true;
-  services.flatpak.update.onActivation = true;
   services.flatpak.packages = [
     { appId = "net.retrodeck.retrodeck"; origin = "flathub";  }
   ];