diff --git a/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs b/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs
index acedd436..82c0821c 100644
--- a/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs
+++ b/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs
@@ -82,7 +82,7 @@ mod tests {
         let req = super::Request {
             limit: Some(uint!(10)),
             since: Some("hello"),
-            server: Some(&server_name!("test.tld")),
+            server: Some(server_name!("test.tld")),
         }
         .try_into_http_request::<Vec<u8>>(
             "https://homeserver.tld",
diff --git a/crates/ruma-events/src/direct.rs b/crates/ruma-events/src/direct.rs
index 5aa6fac3..73b3b717 100644
--- a/crates/ruma-events/src/direct.rs
+++ b/crates/ruma-events/src/direct.rs
@@ -47,8 +47,8 @@ mod tests {
     fn serialization() {
         let mut content = DirectEventContent(BTreeMap::new());
         let server_name = server_name!("ruma.io");
-        let alice = UserId::new(&server_name);
-        let room = vec![RoomId::new(&server_name)];
+        let alice = UserId::new(server_name);
+        let room = vec![RoomId::new(server_name)];
 
         content.insert(alice.clone(), room.clone());
 
@@ -66,8 +66,8 @@ mod tests {
     #[test]
     fn deserialization() {
         let server_name = server_name!("ruma.io");
-        let alice = UserId::new(&server_name);
-        let rooms = vec![RoomId::new(&server_name), RoomId::new(&server_name)];
+        let alice = UserId::new(server_name);
+        let rooms = vec![RoomId::new(server_name), RoomId::new(server_name)];
 
         let json_data = json!({
             "content": {
diff --git a/crates/ruma-events/src/room/member.rs b/crates/ruma-events/src/room/member.rs
index bbc37290..707becc6 100644
--- a/crates/ruma-events/src/room/member.rs
+++ b/crates/ruma-events/src/room/member.rs
@@ -494,7 +494,7 @@ mod tests {
                 && third_party_displayname == "alice"
                 && mxid == "@alice:example.org"
                 && signatures == btreemap! {
-                    server_name!("magic.forest") => btreemap! {
+                    server_name!("magic.forest").to_owned() => btreemap! {
                         server_signing_key_id!("ed25519:3").to_owned() => "foobar".to_owned()
                     }
                 }
@@ -579,7 +579,7 @@ mod tests {
                 && third_party_displayname == "alice"
                 && mxid == "@alice:example.org"
                 && signatures == btreemap! {
-                    server_name!("magic.forest") => btreemap! {
+                    server_name!("magic.forest").to_owned() => btreemap! {
                         server_signing_key_id!("ed25519:3").to_owned() => "foobar".to_owned()
                     }
                 }
@@ -653,7 +653,7 @@ mod tests {
                 && third_party_displayname == "alice"
                 && mxid == "@alice:example.org"
                 && signatures == btreemap! {
-                    server_name!("magic.forest") => btreemap! {
+                    server_name!("magic.forest").to_owned() => btreemap! {
                         server_signing_key_id!("ed25519:3").to_owned() => "foobar".to_owned()
                     }
                 }
diff --git a/crates/ruma-events/src/room/pinned_events.rs b/crates/ruma-events/src/room/pinned_events.rs
index bb2debc9..cfcdecf4 100644
--- a/crates/ruma-events/src/room/pinned_events.rs
+++ b/crates/ruma-events/src/room/pinned_events.rs
@@ -38,16 +38,16 @@ mod tests {
             RoomPinnedEventsEventContent { pinned: Vec::new() };
         let server_name = server_name!("example.com");
 
-        content.pinned.push(EventId::new(&server_name));
-        content.pinned.push(EventId::new(&server_name));
+        content.pinned.push(EventId::new(server_name));
+        content.pinned.push(EventId::new(server_name));
 
         let event = StateEvent {
             content: content.clone(),
-            event_id: EventId::new(&server_name),
+            event_id: EventId::new(server_name),
             origin_server_ts: MilliSecondsSinceUnixEpoch(1_432_804_485_886_u64.try_into().unwrap()),
             prev_content: None,
-            room_id: RoomId::new(&server_name),
-            sender: UserId::new(&server_name),
+            room_id: RoomId::new(server_name),
+            sender: UserId::new(server_name),
             state_key: "".into(),
             unsigned: Unsigned::default(),
         };
diff --git a/crates/ruma-events/src/space/child.rs b/crates/ruma-events/src/space/child.rs
index ad72bad3..0c4fba5b 100644
--- a/crates/ruma-events/src/space/child.rs
+++ b/crates/ruma-events/src/space/child.rs
@@ -57,7 +57,7 @@ mod tests {
     #[test]
     fn space_child_serialization() {
         let content = SpaceChildEventContent {
-            via: Some(vec![server_name!("example.com")]),
+            via: Some(vec![server_name!("example.com").to_owned()]),
             order: Some("uwu".to_owned()),
             suggested: Some(false),
         };
diff --git a/crates/ruma-events/src/space/parent.rs b/crates/ruma-events/src/space/parent.rs
index 37abe5b5..918d4de2 100644
--- a/crates/ruma-events/src/space/parent.rs
+++ b/crates/ruma-events/src/space/parent.rs
@@ -45,7 +45,7 @@ mod tests {
     #[test]
     fn space_parent_serialization() {
         let content = SpaceParentEventContent {
-            via: Some(vec![server_name!("example.com")]),
+            via: Some(vec![server_name!("example.com").to_owned()]),
             canonical: true,
         };
 
diff --git a/crates/ruma-events/tests/pdu.rs b/crates/ruma-events/tests/pdu.rs
index 5edd9a86..04ae1fb0 100644
--- a/crates/ruma-events/tests/pdu.rs
+++ b/crates/ruma-events/tests/pdu.rs
@@ -21,7 +21,7 @@ fn serialize_pdu_as_v1() {
         server_signing_key_id!("ed25519:key_version").to_owned(),
         "86BytesOfSignatureOfTheRedactedEvent".into(),
     );
-    signatures.insert(server_name!("example.com"), inner_signature);
+    signatures.insert(server_name!("example.com").to_owned(), inner_signature);
 
     let mut unsigned = BTreeMap::new();
     unsigned.insert("somekey".into(), to_raw_json_value(&json!({ "a": 456 })).unwrap());
@@ -88,7 +88,7 @@ fn serialize_pdu_as_v3() {
         server_signing_key_id!("ed25519:key_version").to_owned(),
         "86BytesOfSignatureOfTheRedactedEvent".into(),
     );
-    signatures.insert(server_name!("example.com"), inner_signature);
+    signatures.insert(server_name!("example.com").to_owned(), inner_signature);
 
     let mut unsigned = BTreeMap::new();
     unsigned.insert("somekey".into(), to_raw_json_value(&json!({ "a": 456 })).unwrap());
diff --git a/crates/ruma-identifiers-macros/src/lib.rs b/crates/ruma-identifiers-macros/src/lib.rs
index ea071905..507e609f 100644
--- a/crates/ruma-identifiers-macros/src/lib.rs
+++ b/crates/ruma-identifiers-macros/src/lib.rs
@@ -103,9 +103,7 @@ pub fn server_name(input: TokenStream) -> TokenStream {
     assert!(server_name::validate(&id.value()).is_ok(), "Invalid server_name");
 
     let output = quote! {
-        <::std::boxed::Box::<#dollar_crate::ServerName> as ::std::convert::TryFrom<&str>>::try_from(
-            #id,
-        ).unwrap()
+        <&#dollar_crate::ServerName as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
     };
 
     output.into()
diff --git a/crates/ruma-identifiers/src/event_id.rs b/crates/ruma-identifiers/src/event_id.rs
index bd749c70..64471bec 100644
--- a/crates/ruma-identifiers/src/event_id.rs
+++ b/crates/ruma-identifiers/src/event_id.rs
@@ -114,7 +114,7 @@ mod tests {
     fn generate_random_valid_event_id() {
         use crate::server_name;
 
-        let event_id = EventId::new(&server_name!("example.com"));
+        let event_id = EventId::new(server_name!("example.com"));
         let id_str = event_id.as_str();
 
         assert!(id_str.starts_with('$'));
diff --git a/crates/ruma-identifiers/src/room_id.rs b/crates/ruma-identifiers/src/room_id.rs
index 25da31b4..b30eb275 100644
--- a/crates/ruma-identifiers/src/room_id.rs
+++ b/crates/ruma-identifiers/src/room_id.rs
@@ -104,7 +104,7 @@ mod tests {
     fn generate_random_valid_room_id() {
         use crate::server_name;
 
-        let room_id = RoomId::new(&server_name!("example.com"));
+        let room_id = RoomId::new(server_name!("example.com"));
         let id_str = room_id.as_str();
 
         assert!(id_str.starts_with('!'));
diff --git a/crates/ruma-identifiers/src/user_id.rs b/crates/ruma-identifiers/src/user_id.rs
index 14852d51..155d3609 100644
--- a/crates/ruma-identifiers/src/user_id.rs
+++ b/crates/ruma-identifiers/src/user_id.rs
@@ -113,7 +113,7 @@ mod tests {
     #[test]
     fn parse_valid_user_id() {
         let server_name = server_name!("example.com");
-        let user_id = UserId::parse_with_server_name("@carl:example.com", &server_name)
+        let user_id = UserId::parse_with_server_name("@carl:example.com", server_name)
             .expect("Failed to create UserId.");
         assert_eq!(user_id.as_str(), "@carl:example.com");
         assert_eq!(user_id.localpart(), "carl");
@@ -125,7 +125,7 @@ mod tests {
     fn parse_valid_user_id_parts() {
         let server_name = server_name!("example.com");
         let user_id =
-            UserId::parse_with_server_name("carl", &server_name).expect("Failed to create UserId.");
+            UserId::parse_with_server_name("carl", server_name).expect("Failed to create UserId.");
         assert_eq!(user_id.as_str(), "@carl:example.com");
         assert_eq!(user_id.localpart(), "carl");
         assert_eq!(user_id.server_name(), "example.com");
@@ -145,7 +145,7 @@ mod tests {
     #[test]
     fn parse_valid_historical_user_id() {
         let server_name = server_name!("example.com");
-        let user_id = UserId::parse_with_server_name("@a%b[irc]:example.com", &server_name)
+        let user_id = UserId::parse_with_server_name("@a%b[irc]:example.com", server_name)
             .expect("Failed to create UserId.");
         assert_eq!(user_id.as_str(), "@a%b[irc]:example.com");
         assert_eq!(user_id.localpart(), "a%b[irc]");
@@ -156,7 +156,7 @@ mod tests {
     #[test]
     fn parse_valid_historical_user_id_parts() {
         let server_name = server_name!("example.com");
-        let user_id = UserId::parse_with_server_name("a%b[irc]", &server_name)
+        let user_id = UserId::parse_with_server_name("a%b[irc]", server_name)
             .expect("Failed to create UserId.");
         assert_eq!(user_id.as_str(), "@a%b[irc]:example.com");
         assert_eq!(user_id.localpart(), "a%b[irc]");
@@ -175,7 +175,7 @@ mod tests {
     #[test]
     fn generate_random_valid_user_id() {
         let server_name = server_name!("example.com");
-        let user_id = UserId::new(&server_name);
+        let user_id = UserId::new(server_name);
         assert_eq!(user_id.localpart().len(), 12);
         assert_eq!(user_id.server_name(), "example.com");