diff --git a/modules/oms/systems.scm b/modules/oms/systems.scm
index 3a59229..34db4e2 100644
--- a/modules/oms/systems.scm
+++ b/modules/oms/systems.scm
@@ -239,7 +239,14 @@ ID with the extended system as it's value."
       (inherit base)
       (firmware (cons sof-firmware (operating-system-firmware base)))
       (initrd-modules
-       (append '("vmd") (operating-system-initrd-modules base))))))
+       (append '("vmd") (operating-system-initrd-modules base)))
+      (services
+       (modify-services (operating-system-user-services base)
+         (elogind-service-type config =>
+           (elogind-configuration
+             (inherit config)
+             ;; This machine gets stuck with proper deep sleep (suspend to RAM)
+             (suspend-mode '(s2idle)))))))))
 
 (define-system oms-kone
   (let ((base (base-operating-system "OMS-kone"))