diff --git a/hosts/fallarbor/default.nix b/hosts/fallarbor/default.nix
index 8fbc0b79..834fc95e 100644
--- a/hosts/fallarbor/default.nix
+++ b/hosts/fallarbor/default.nix
@@ -26,6 +26,9 @@
   };
 
   alyraffauf = {
+    services = {
+      flatpak.enable = true;
+    };
     system = {
       plymouth.enable = true;
       zramSwap = {enable = true;};
@@ -39,7 +42,6 @@
       hyprland.enable = true;
     };
     apps = {
-      flatpak.enable = true;
       steam.enable = true;
     };
   };
diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix
index 3f35130d..4de03f32 100644
--- a/nixosModules/apps/default.nix
+++ b/nixosModules/apps/default.nix
@@ -4,5 +4,5 @@
   config,
   ...
 }: {
-  imports = [./flatpak ./nicotine-plus ./steam ./podman ./virt-manager];
+  imports = [./nicotine-plus ./steam ./podman ./virt-manager];
 }
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 29264838..19007c8e 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -3,5 +3,5 @@
   pkgs,
   ...
 }: {
-  imports = [./apps ./desktop ./homeLab ./system ./user];
+  imports = [./apps ./desktop ./homeLab ./services ./system ./user];
 }
diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix
new file mode 100644
index 00000000..eb326b9a
--- /dev/null
+++ b/nixosModules/services/default.nix
@@ -0,0 +1,8 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [./flatpak];
+}
diff --git a/nixosModules/apps/flatpak/default.nix b/nixosModules/services/flatpak/default.nix
similarity index 90%
rename from nixosModules/apps/flatpak/default.nix
rename to nixosModules/services/flatpak/default.nix
index ba66fa70..c2eaa5f6 100644
--- a/nixosModules/apps/flatpak/default.nix
+++ b/nixosModules/services/flatpak/default.nix
@@ -5,11 +5,11 @@
   ...
 }: {
   options = {
-    alyraffauf.apps.flatpak.enable =
+    alyraffauf.services.flatpak.enable =
       lib.mkEnableOption "Enables flatpak support with GUI.";
   };
 
-  config = lib.mkIf config.alyraffauf.apps.flatpak.enable {
+  config = lib.mkIf config.alyraffauf.services.flatpak.enable {
     # Needed for Flatpaks
     xdg.portal.enable = true;
     services.flatpak.enable = true;