diff --git a/src/Server/src/main/java/greenify/server/data/model/Activity.java b/src/Server/src/main/java/greenify/server/data/model/Activity.java
index 39a9ad7..d15eedf 100644
--- a/src/Server/src/main/java/greenify/server/data/model/Activity.java
+++ b/src/Server/src/main/java/greenify/server/data/model/Activity.java
@@ -16,7 +16,7 @@ public class Activity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    long id;
+    Long id;
     String name;
     String description;
     int score;
diff --git a/src/Server/src/test/java/ActivityTest.java b/src/Server/src/test/java/ActivityTest.java
index 7a491e2..28e39b9 100644
--- a/src/Server/src/test/java/ActivityTest.java
+++ b/src/Server/src/test/java/ActivityTest.java
@@ -7,13 +7,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class ActivityTest {
     @Test
     public void setAndGetTest() {
-        Activity activity = new Activity(1, "Vegetarian", "Eating", 100);
+        Activity activity = new Activity(1L, "Vegetarian", "Eating", 100);
         Activity testActivity = new Activity(0, null, null, 0);
-        testActivity.setId(1);
+        testActivity.setId(1L);
         testActivity.setName("Vegetarian");
         testActivity.setDescription("Eating");
         testActivity.setScore(100);
-        assertEquals(activity.getId(), 1);
+        assertTrue(activity.getId().equals(1L));
         assertEquals(activity.getName(), "Vegetarian");
         assertEquals(activity.getDescription(), "Eating");
         assertEquals(activity.getScore(), 100);