diff --git a/ruma-common/CHANGELOG.md b/ruma-common/CHANGELOG.md
index ccdd4746..b2d53380 100644
--- a/ruma-common/CHANGELOG.md
+++ b/ruma-common/CHANGELOG.md
@@ -4,6 +4,8 @@ Breaking changes:
 
 * Use `ruma_identifiers::MxcUri` instead of `String` for `avatar_url` field in
   `directory::PublicRoomsChunk`
+* Use `ruma_identifiers::RoomId` instead of `String` for `room_id` field in
+  `push::PushConditionRoomCtx`
 
 # 0.3.1
 
diff --git a/ruma-common/src/push.rs b/ruma-common/src/push.rs
index 12a47cbb..cb52db76 100644
--- a/ruma-common/src/push.rs
+++ b/ruma-common/src/push.rs
@@ -509,7 +509,7 @@ mod tests {
 
     use js_int::uint;
     use matches::assert_matches;
-    use ruma_identifiers::user_id;
+    use ruma_identifiers::{room_id, user_id};
     use ruma_serde::Raw;
     use serde_json::{
         from_value as from_json_value, json, to_value as to_json_value,
@@ -1009,7 +1009,7 @@ mod tests {
         let set = Ruleset::server_default(&user_id!("@jolly_jumper:server.name"));
 
         let context_one_to_one = &PushConditionRoomCtx {
-            room_id: "!dm:server.name".into(),
+            room_id: room_id!("!dm:server.name"),
             member_count: 2u32.into(),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
@@ -1018,7 +1018,7 @@ mod tests {
         };
 
         let context_public_room = &PushConditionRoomCtx {
-            room_id: "!far_west:server.name".into(),
+            room_id: room_id!("!far_west:server.name"),
             member_count: 100u32.into(),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
@@ -1098,7 +1098,7 @@ mod tests {
     #[test]
     fn custom_ruleset_applies() {
         let context_one_to_one = &PushConditionRoomCtx {
-            room_id: "!dm:server.name".into(),
+            room_id: room_id!("!dm:server.name"),
             member_count: 2u32.into(),
             user_display_name: "Jolly Jumper".into(),
             users_power_levels: BTreeMap::new(),
diff --git a/ruma-common/src/push/condition.rs b/ruma-common/src/push/condition.rs
index 8601d617..80774b16 100644
--- a/ruma-common/src/push/condition.rs
+++ b/ruma-common/src/push/condition.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, convert::TryFrom, ops::RangeBounds, str::FromStr};
 
 use js_int::{Int, UInt};
-use ruma_identifiers::UserId;
+use ruma_identifiers::{RoomId, UserId};
 use ruma_serde::Raw;
 use serde::{Deserialize, Serialize};
 use serde_json::{to_value as to_json_value, value::Value as JsonValue};
@@ -63,7 +63,7 @@ impl PushCondition {
         match self {
             Self::EventMatch { key, pattern } => {
                 let value = match key.as_str() {
-                    "room_id" => &context.room_id,
+                    "room_id" => context.room_id.as_str(),
                     _ => match event.get(key) {
                         Some(v) => v,
                         None => return false,
@@ -107,8 +107,8 @@ impl PushCondition {
 /// The context of the room associated to an event to be able to test all push conditions.
 #[derive(Clone, Debug)]
 pub struct PushConditionRoomCtx {
-    /// The roomId of the room.
-    pub room_id: String,
+    /// The ID of the room.
+    pub room_id: RoomId,
 
     /// The number of members in the room.
     pub member_count: UInt,
@@ -310,7 +310,7 @@ mod tests {
     use js_int::uint;
     use maplit::btreemap;
     use matches::assert_matches;
-    use ruma_identifiers::user_id;
+    use ruma_identifiers::{room_id, user_id};
     use ruma_serde::Raw;
     use serde_json::{
         from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue,
@@ -476,7 +476,7 @@ mod tests {
         users_power_levels.insert(first_sender, 25.into());
 
         let context = PushConditionRoomCtx {
-            room_id: "!room:server.name".into(),
+            room_id: room_id!("!room:server.name"),
             member_count: 3u8.into(),
             user_display_name: "Groovy Gorilla".into(),
             users_power_levels,