diff --git a/src/utils/objectId.ts b/src/utils/objectId.ts
index f79878a2..1ada9bfb 100644
--- a/src/utils/objectId.ts
+++ b/src/utils/objectId.ts
@@ -14,11 +14,11 @@ export function objectIdFromDate(milliseconds: number, onlyDate: boolean = false
       return '0';
     }
 
-    return (_.random() * 16 | 0).toString(16);
+    return (_.random(0, 1, true) * 16 | 0).toString(16);
   };
 
   const timestamp = (milliseconds / 1000 | 0).toString(16);
-  const suffix = 'xxxxxxxxxxxxxxxx'.replace(/[x]/g, suffixReplacer).toLowerCase();
+  const suffix = 'xxxxxxxxxxxxxxxx'.replace(/x/g, suffixReplacer).toLowerCase();
 
   return `${timestamp}${suffix}`;
 }