diff --git a/engine/services/file_service.cc b/engine/services/file_service.cc
index f2514fbfb..3341227e0 100644
--- a/engine/services/file_service.cc
+++ b/engine/services/file_service.cc
@@ -1,6 +1,6 @@
 #include "file_service.h"
 #include <cstdint>
-#include "utils/ulid/ulid.hh"
+#include "utils/ulid_generator.h"
 
 cpp::result<OpenAi::File, std::string> FileService::UploadFile(
     const std::string& filename, const std::string& purpose,
@@ -11,7 +11,7 @@ cpp::result<OpenAi::File, std::string> FileService::UploadFile(
           std::chrono::system_clock::now().time_since_epoch())
           .count();
 
-  auto file_id{"file-" + ulid::Marshal(ulid::CreateNowRand())};
+  auto file_id{"file-" + ulid::GenerateUlid()};
   OpenAi::File file;
   file.id = file_id;
   file.object = "file";
diff --git a/engine/services/message_service.cc b/engine/services/message_service.cc
index 5b871f447..9b57e0215 100644
--- a/engine/services/message_service.cc
+++ b/engine/services/message_service.cc
@@ -1,7 +1,7 @@
 #include "services/message_service.h"
 #include "utils/logging_utils.h"
 #include "utils/result.hpp"
-#include "utils/ulid/ulid.hh"
+#include "utils/ulid_generator.h"
 
 cpp::result<OpenAi::Message, std::string> MessageService::CreateMessage(
     const std::string& thread_id, const OpenAi::Role& role,
@@ -27,11 +27,8 @@ cpp::result<OpenAi::Message, std::string> MessageService::CreateMessage(
         std::get<std::vector<std::unique_ptr<OpenAi::Content>>>(content));
   }
 
-  auto ulid = ulid::CreateNowRand();
-  auto msg_id = ulid::Marshal(ulid);
-
   OpenAi::Message msg;
-  msg.id = msg_id;
+  msg.id = ulid::GenerateUlid();
   msg.object = "thread.message";
   msg.created_at = seconds_since_epoch;
   msg.thread_id = thread_id;
diff --git a/engine/services/thread_service.cc b/engine/services/thread_service.cc
index 25784c2ee..0ec0ac89d 100644
--- a/engine/services/thread_service.cc
+++ b/engine/services/thread_service.cc
@@ -1,6 +1,7 @@
 #include "thread_service.h"
+#include <chrono>
 #include "utils/logging_utils.h"
-#include "utils/ulid/ulid.hh"
+#include "utils/ulid_generator.h"
 
 cpp::result<OpenAi::Thread, std::string> ThreadService::CreateThread(
     std::unique_ptr<OpenAi::ThreadToolResources> tool_resources,
@@ -12,11 +13,8 @@ cpp::result<OpenAi::Thread, std::string> ThreadService::CreateThread(
           std::chrono::system_clock::now().time_since_epoch())
           .count();
 
-  auto ulid = ulid::CreateNowRand();
-  auto thread_id = ulid::Marshal(ulid);
-
   OpenAi::Thread thread;
-  thread.id = thread_id;
+  thread.id = ulid::GenerateUlid();
   thread.object = "thread";
   thread.created_at = seconds_since_epoch;
 
diff --git a/engine/utils/ulid_generator.h b/engine/utils/ulid_generator.h
new file mode 100644
index 000000000..2d4bb2b0f
--- /dev/null
+++ b/engine/utils/ulid_generator.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <string>
+#include "utils/ulid/ulid.hh"
+
+namespace ulid {
+inline std::string GenerateUlid() {
+  auto millisecs = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       std::chrono::system_clock::now().time_since_epoch())
+                       .count();
+
+  std::random_device rd;
+  std::mt19937_64 gen(rd());
+  std::uniform_int_distribution<unsigned int> dis(0, 255);
+  auto ulid = ulid::Create(
+      millisecs, [&dis, &gen]() { return static_cast<uint8_t>(dis(gen)); });
+  return ulid::Marshal(ulid);
+}
+}  // namespace ulid