diff --git a/gnu/system.scm b/gnu/system.scm
index 1cf00aafcd..1052e9355d 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -842,9 +842,8 @@ (define* (operating-system-profile os #:key container?)
 
 (define (operating-system-root-file-system os)
   "Return the root file system of OS."
-  (find (match-lambda
-         (($ <file-system> device title "/") #t)
-         (x #f))
+  (find (lambda (fs)
+          (string=? "/" (file-system-mount-point fs)))
         (operating-system-file-systems os)))
 
 (define (operating-system-initrd-file os)
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index d2acd705de..93289dbd5d 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -25,8 +25,7 @@ (define-module (gnu system file-systems)
   #:re-export (uuid                               ;backward compatibility
                string->uuid
                uuid->string)
-  #:export (<file-system>
-            file-system
+  #:export (file-system
             file-system?
             file-system-device
             file-system-title