diff --git a/src/main/java/io/autoinvestor/infrastructure/event_publishers/EventMessageMapper.java b/src/main/java/io/autoinvestor/infrastructure/event_publishers/EventMessageMapper.java
index e09cb39..5f2c762 100644
--- a/src/main/java/io/autoinvestor/infrastructure/event_publishers/EventMessageMapper.java
+++ b/src/main/java/io/autoinvestor/infrastructure/event_publishers/EventMessageMapper.java
@@ -24,7 +24,7 @@ PubsubMessage toMessage(Event<?> event) {
         try {
             Map<String, Object> envelope = new HashMap<>();
             envelope.put("payload",     event.getPayload().asMap());
-            envelope.put("eventId",     event.getId().toString());
+            envelope.put("eventId",     event.getId().value());
             envelope.put("type",        event.getType());
             envelope.put("aggregateId", event.getAggregateId().value());
             envelope.put("occurredAt",
diff --git a/src/main/java/io/autoinvestor/infrastructure/repositories/MongoEventStoreRepository.java b/src/main/java/io/autoinvestor/infrastructure/repositories/MongoEventStoreRepository.java
index 6305588..85f765e 100644
--- a/src/main/java/io/autoinvestor/infrastructure/repositories/MongoEventStoreRepository.java
+++ b/src/main/java/io/autoinvestor/infrastructure/repositories/MongoEventStoreRepository.java
@@ -40,7 +40,7 @@ public void save(Decision decision) {
     public Decision get(DecisionId decisionId) {
         Query q = Query.query(
                         Criteria.where("aggregateId")
-                                .is(decisionId.toString())
+                                .is(decisionId.value())
                 )
                 .with(Sort.by("version"));