@Tomek *********
yes...but be sure that you have a TM30 address registration filed in Samui.
And be prepared to answer the question why are you still in Thailand? The COVID extension is not guaranteed.
The Immigration Officers have been instructed to be stricter in granting the COVID extensions.