diff --git a/nvim/lua/utils.lua b/nvim/lua/utils.lua
index d250a7b..8b221c7 100644
--- a/nvim/lua/utils.lua
+++ b/nvim/lua/utils.lua
@@ -83,11 +83,11 @@ function M.add_opts_to_all_mappings(mappings, opts)
 end
 
 function M.is_buf_filetype(bufnr, filetype)
-    return vim.api.nvim_buf_get_option(bufnr, "filetype") == filetype
+    return vim.api.nvim_get_option_value("filetype", { buf = bufnr }) == filetype
 end
 
-function M.is_buf_buftype(bufnr, filetype)
-    return vim.api.nvim_buf_get_option(bufnr, "buftype") == filetype
+function M.is_buf_buftype(bufnr, buftype)
+    return vim.api.nvim_get_option_value("buftype", { buf = bufnr }) == buftype
 end
 
 function M.lock_buf_to_window(win_id, bufnr, filetype)
diff --git a/nvim/lua/window_management.lua b/nvim/lua/window_management.lua
index 6adfbf3..0ec86f0 100644
--- a/nvim/lua/window_management.lua
+++ b/nvim/lua/window_management.lua
@@ -26,7 +26,7 @@ local function window_has_valid_buffer(window)
         return false
     end
 
-    local buf_type = vim.api.nvim_buf_get_option(buf, "buftype")
+    local buf_type = vim.api.nvim_get_option_value("buftype", { buf = buf })
     if buf_type ~= "" then
         return false
     end