diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -2,6 +2,7 @@
     andpostingiterator.cpp
     database.cpp
     document.cpp
+    documentid.cpp
     documentdb.cpp
     documentdatadb.cpp
     documenturldb.cpp
diff --git a/src/engine/andpostingiterator.h b/src/engine/andpostingiterator.h
--- a/src/engine/andpostingiterator.h
+++ b/src/engine/andpostingiterator.h
@@ -22,6 +22,8 @@
 #define BALOO_ANDPOSTINGITERATOR_H
 
 #include "postingiterator.h"
+#include "documentid.h"
+
 #include <QVector>
 
 namespace Baloo {
diff --git a/src/engine/documentid.h b/src/engine/documentid.h
--- a/src/engine/documentid.h
+++ b/src/engine/documentid.h
@@ -52,5 +52,6 @@
     Inode m_inode;
 };
 }
+QDebug operator<<(QDebug stream, const Baloo::DocumentId &docId);
 
 #endif // DOCUMENTID_H
diff --git a/src/engine/documentid.cpp b/src/engine/documentid.cpp
--- a/src/engine/documentid.cpp
+++ b/src/engine/documentid.cpp
@@ -21,6 +21,8 @@
 
 #include "documentid.h"
 
+#include <QDebug>
+
 using namespace Baloo;    
 
 DocumentId::DocumentId()
@@ -109,5 +111,3 @@
 {
     return m_inode;
 }
-
-
diff --git a/src/engine/idutils.h b/src/engine/idutils.h
--- a/src/engine/idutils.h
+++ b/src/engine/idutils.h
@@ -24,6 +24,7 @@
 #define BALOO_ID_UTILS_
 
 #include "idutils.h"
+#include "documentid.h"
 
 #include <qplatformdefs.h>
 #include <qglobal.h>
@@ -35,17 +36,13 @@
 #endif
 
 namespace Baloo {
-    using DocId = quint64;
+    using DocId = DocumentId;
     using DeviceId = quint32;
     using Inode = quint32;
 
 inline DocId devIdAndInodeToId(DeviceId devId, Inode inode)
 {
-    quint32 arr[2];
-    arr[0] = devId;
-    arr[1] = inode;
-
-    return *(reinterpret_cast<DocId*>(arr));
+    return DocumentId(devId, inode);
 }
 
 /**
diff --git a/src/engine/postingiterator.h b/src/engine/postingiterator.h
--- a/src/engine/postingiterator.h
+++ b/src/engine/postingiterator.h
@@ -24,6 +24,8 @@
 #include <QVector>
 #include "engine_export.h"
 #include "idutils.h"
+#include "documentid.h"
+
 
 namespace Baloo {