I wouldn't suggest going for a recent X1 as there are some driver issues on Linux.

My current one is a Thinkpad 14s AMD. As somebody who had most smaller Thinkpads and Dells in the last 15 years, this is my favourite machine so far: great battery, a decent GPU, still a Thinkpad, perfect Linux support.

Which generation is that T14s? I am in the market for a new one.