+1 here... Lenovo business laptops have a history of being particularly good at being user repairable.
I'm probably going to go with Framework myself whenever I do upgrade. Still using an M1 air, which suites my day to day needs, I don't develop on it, as I can remote to my desktop from anywhere.