As long as you can demonstrate you are replacing your main residence and that your previous main residence has been disposed of then the surcharge wouldn’t apply.
It is a self assessed tax ultimately but I would recommend you give the HMRC stamp duty helpline a call, although perhaps not today given the changes announced.